diff --git a/devel/jdk/1.6/Makefile b/devel/jdk/1.6/Makefile
index ecfd2eafadd..89455750b9c 100644
--- a/devel/jdk/1.6/Makefile
+++ b/devel/jdk/1.6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2013/02/01 15:34:35 kurt Exp $
+# $OpenBSD: Makefile,v 1.39 2013/02/02 17:41:18 kurt Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	amd64 i386
@@ -10,7 +10,9 @@ UPDATE=		32
 BUILD=		b27
 PKGNAME=	jdk-${VERSION}
 PKGNAME-main=	jdk-${VERSION}
+REVISION-main=	0
 PKGNAME-jre=	jre-${VERSION}
+REVISION-jre=	0
 
 # see jaxp/jaxp.properties & jaxws/jaxws.properties 
 # in ${WRKDIR} for names and download locations of extra distfiles
diff --git a/devel/jdk/1.6/patches/patch-jdk_src_solaris_native_java_net_PlainDatagramSocketImpl_c b/devel/jdk/1.6/patches/patch-jdk_src_solaris_native_java_net_PlainDatagramSocketImpl_c
new file mode 100644
index 00000000000..a7121014b3b
--- /dev/null
+++ b/devel/jdk/1.6/patches/patch-jdk_src_solaris_native_java_net_PlainDatagramSocketImpl_c
@@ -0,0 +1,39 @@
+$OpenBSD: patch-jdk_src_solaris_native_java_net_PlainDatagramSocketImpl_c,v 1.1 2013/02/02 17:41:18 kurt Exp $
+--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig	Fri Feb  1 11:16:47 2013
++++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Fri Feb  1 12:52:14 2013
+@@ -1338,7 +1338,7 @@ static void setMulticastInterface(JNIEnv *env, jobject
+         /*
+          * value is an InetAddress.
+          */
+-#ifdef __solaris__
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+         if (ipv6_available()) {
+             mcast_set_if_by_addr_v6(env, this, fd, value);
+         } else {
+@@ -1357,7 +1357,7 @@ static void setMulticastInterface(JNIEnv *env, jobject
+         /*
+          * value is a NetworkInterface.
+          */
+-#ifdef __solaris__
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+         if (ipv6_available()) {
+             mcast_set_if_by_if_v6(env, this, fd, value);
+         } else {
+@@ -1434,7 +1434,7 @@ static void mcast_set_loop_v6(JNIEnv *env, jobject thi
+  */
+ static void setMulticastLoopbackMode(JNIEnv *env, jobject this, int fd,
+                                   jint opt, jobject value) {
+-#ifdef __solaris__
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+     if (ipv6_available()) {
+         mcast_set_loop_v6(env, this, fd, value);
+     } else {
+@@ -2002,7 +2002,7 @@ Java_java_net_PlainDatagramSocketImpl_setTimeToLive(JN
+         fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
+     }
+     /* setsockopt to be correct ttl */
+-#ifdef __solaris__
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+     if (ipv6_available()) {
+         setHopLimit(env, fd, ttl);
+     } else {