diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 4956b0d..d6f29ef 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for virtual/jdk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.30 2010/02/09 17:23:19 grobian Exp $
 
+  25 Nov 2011; Mario Fetka <mario.fetka@gmail.com> jdk-1.6.0.ebuild:
+  add stable arm keyword
+
   12 Feb 2010; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
   add arm
 
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index c98d68d..4247ec3 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,3 +1,3 @@
-EBUILD jdk-1.6.0.ebuild 1566 RMD160 e7e1b81096a26734700d2e5a660e6c9a6f4d76ba SHA1 0122ea2d028c3b1fa70d78ca2ce876c23457dc48 SHA256 bda0544645a104ed31d8162571353d5cad72a711fa969dd5516f851dcf74c54c
-MISC ChangeLog 4383 RMD160 702c35d866daf70a1d7bc2ecdca01fcd5bc355f5 SHA1 8fb5e6da3e5a9ea4647ac767c2338dd2d5866c0c SHA256 ede2e84b9ef67c74da932348a17d0260362c87b7185308da923b0bd02156b215
+EBUILD jdk-1.6.0.ebuild 1973 RMD160 e3a51b2023de4a3317886d621776092830406c48 SHA1 7a54171d42b90377b4e01f9a4ef7bbea94e15735 SHA256 d1876477cb0d5dd67666342590440d22b6183356ab916b1f0006d3a4ff5c2243
+MISC ChangeLog 4478 RMD160 e71761b76824cceeb6d20049e213c36b37449952 SHA1 f6f38df4606195c8200a76bae6aefbb95085e173 SHA256 be247ea0c3bdddbf560485e69fff7af20c4678e01ce48e00ee46ff2a0838640a
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild
index 4a17cac..5946e9d 100644
--- a/virtual/jdk/jdk-1.6.0.ebuild
+++ b/virtual/jdk/jdk-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.17 2010/02/09 17:23:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.23 2011/11/07 16:05:27 caster Exp $
 
 DESCRIPTION="Virtual for JDK"
 HOMEPAGE=""
@@ -8,35 +8,63 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="1.6"
-KEYWORDS="arm amd64 ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
-# Keeps this and java-virtuals/jaf in sync
 # The keyword voodoo below is needed so that ppc(64) users will
 # get a masked license warning for ibm-jdk-bin
 # instead of (not useful) missing keyword warning for sun-jdk
 # see #287615
 # note that this "voodoo" is pretty annoying for Prefix, and that we didn't
 # invent it in the first place!
-RDEPEND="|| (
-		arm? ( dev-java/icedtea6-bin )
-		amd64? ( dev-java/icedtea6-bin )
-		x86? ( dev-java/icedtea6-bin )
-		amd64? ( =dev-java/sun-jdk-1.6.0* )
-		x86? ( =dev-java/sun-jdk-1.6.0* )
-		amd64-linux? ( dev-java/icedtea6-bin )
-		x86-linux? ( dev-java/icedtea6-bin )
-		amd64-linux? ( =dev-java/sun-jdk-1.6.0* )
-		x86-linux? ( =dev-java/sun-jdk-1.6.0* )
-		x64-solaris? ( =dev-java/sun-jdk-1.6.0* )
-		x86-solaris? ( =dev-java/sun-jdk-1.6.0* )
-		sparc-solaris? ( =dev-java/sun-jdk-1.6.0* )
-		sparc64-solaris? ( =dev-java/sun-jdk-1.6.0* )
+
+COMMON_INC="
 		=dev-java/ibm-jdk-bin-1.6.0*
 		=dev-java/hp-jdk-bin-1.6.0*
 		=dev-java/diablo-jdk-1.6.0*
 		=dev-java/soylatte-jdk-bin-1.0*
 		=dev-java/apple-jdk-bin-1.6.0*
 		=dev-java/winjdk-bin-1.6.0*
+"
+
+# icedtea-bin-1* is old versioning scheme of icedtea-bin-6*
+X86_OPTS="|| (
+		=dev-java/icedtea-bin-6*
+		=dev-java/icedtea-bin-1*
+		=dev-java/icedtea-6*
+		=dev-java/sun-jdk-1.6.0*
+		${COMMON_INC}
+	)"
+
+X86_PREFIX_OPTS="|| (
+		=dev-java/icedtea-bin-6*
+		=dev-java/icedtea-bin-1*
+		=dev-java/sun-jdk-1.6.0*
+		${COMMON_INC}
+	)"
+
+PPC_OPTS="|| (
+		=dev-java/ibm-jdk-bin-1.6.0*
+		=dev-java/icedtea-6*
+	)"
+
+COMMON_OPTS="|| (
+		${COMMON_INC}
+		)"
+
+RDEPEND="|| (
+		amd64? ( ${X86_OPTS} )
+		x86? ( ${X86_OPTS} )
+		ppc? ( ${PPC_OPTS} )
+		ppc64? ( ${PPC_OPTS} )
+		amd64-linux? ( ${X86_PREFIX_OPTS} )
+		x86-linux? ( ${X86_PREFIX_OPTS} )
+		x64-solaris? ( ${X86_PREFIX_OPTS} )
+		x86-solaris? ( ${X86_PREFIX_OPTS} )
+		sparc-solaris? ( ${X86_PREFIX_OPTS} )
+		sparc64-solaris? ( ${X86_PREFIX_OPTS} )
+		!amd64? ( !x86? ( !ppc? ( !ppc64? ( !amd64-linux? ( !x86-linux? ( !x64-solaris? ( !x86-solaris? ( !sparc-solaris? ( !sparc64-solaris? (
+			${COMMON_OPTS}
+		) ) ) ) ) ) ) ) ) )
 	)"
 DEPEND=""