diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 9c415e21df76..a5d7f21b1a3e 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/communitysource/j2se/java2/download.xml
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
diff --git a/java/jdk15/files/patch-hotspot::vm::amd64.ad b/java/jdk15/files/patch-hotspot::vm::amd64.ad
new file mode 100644
index 000000000000..53c174afeb37
--- /dev/null
+++ b/java/jdk15/files/patch-hotspot::vm::amd64.ad
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../hotspot/src/cpu/amd64/vm/amd64.ad.orig	Wed Feb  8 15:18:24 2006
++++ ../../hotspot/src/cpu/amd64/vm/amd64.ad	Wed Feb  8 15:17:35 2006
+@@ -7246,7 +7246,7 @@
+ 
+   format %{ "negl    $dst\t# int" %}
+   opcode(0xF7, 0x03);  // Opcode F7 /3
+-  ins_encode(REX_reg(dst), OpcP, RM_opc_mem(secondary, dst));
++  ins_encode(REX_mem(dst), OpcP, RM_opc_mem(secondary, dst));
+   ins_pipe(ialu_reg);
+ %}
+ 
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 9c415e21df76..a5d7f21b1a3e 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/communitysource/j2se/java2/download.xml
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
diff --git a/java/jdk16/files/patch-hotspot::vm::amd64.ad b/java/jdk16/files/patch-hotspot::vm::amd64.ad
new file mode 100644
index 000000000000..53c174afeb37
--- /dev/null
+++ b/java/jdk16/files/patch-hotspot::vm::amd64.ad
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../hotspot/src/cpu/amd64/vm/amd64.ad.orig	Wed Feb  8 15:18:24 2006
++++ ../../hotspot/src/cpu/amd64/vm/amd64.ad	Wed Feb  8 15:17:35 2006
+@@ -7246,7 +7246,7 @@
+ 
+   format %{ "negl    $dst\t# int" %}
+   opcode(0xF7, 0x03);  // Opcode F7 /3
+-  ins_encode(REX_reg(dst), OpcP, RM_opc_mem(secondary, dst));
++  ins_encode(REX_mem(dst), OpcP, RM_opc_mem(secondary, dst));
+   ins_pipe(ialu_reg);
+ %}
+