diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index d6f29ef..4d69d57 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -2,6 +2,9 @@
 # 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 arm support
+
   25 Nov 2011; Mario Fetka <mario.fetka@gmail.com> jdk-1.6.0.ebuild:
   add stable arm keyword
 
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 4247ec3..2fb9e11 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,3 +1,3 @@
-EBUILD jdk-1.6.0.ebuild 1973 RMD160 e3a51b2023de4a3317886d621776092830406c48 SHA1 7a54171d42b90377b4e01f9a4ef7bbea94e15735 SHA256 d1876477cb0d5dd67666342590440d22b6183356ab916b1f0006d3a4ff5c2243
-MISC ChangeLog 4478 RMD160 e71761b76824cceeb6d20049e213c36b37449952 SHA1 f6f38df4606195c8200a76bae6aefbb95085e173 SHA256 be247ea0c3bdddbf560485e69fff7af20c4678e01ce48e00ee46ff2a0838640a
+EBUILD jdk-1.6.0.ebuild 2119 RMD160 da2216ea9e430bf218b9ea621a779d2412b4813c SHA1 0af0ac7db44416cfc6f5ae28869a15c122291221 SHA256 db6ca3fd02f7ddf8606d3892191031f21477ef0e4e0bfa1c718ea16c9d1f88a2
+MISC ChangeLog 4566 RMD160 cd97ff64367504d92caf08e0b3900c01a8349b80 SHA1 d3e36da5f8aabf61ef2e9a6c6d12b5ee76c242fb SHA256 d70291f8bd4a4ee91ebcced18ecb143c04dfd54f8c492b29a86615cb736234e8
 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 5946e9d..ebe8965 100644
--- a/virtual/jdk/jdk-1.6.0.ebuild
+++ b/virtual/jdk/jdk-1.6.0.ebuild
@@ -27,6 +27,13 @@ COMMON_INC="
 		=dev-java/winjdk-bin-1.6.0*
 "
 
+ARM_OPTS="|| (
+		=dev-java/icedtea-bin-6*
+		=dev-java/icedtea-6*
+		=dev-java/sun-jdk-1.6.0*
+		${COMMON_INC}
+	)"
+
 # icedtea-bin-1* is old versioning scheme of icedtea-bin-6*
 X86_OPTS="|| (
 		=dev-java/icedtea-bin-6*
@@ -54,6 +61,7 @@ COMMON_OPTS="|| (
 
 RDEPEND="|| (
 		amd64? ( ${X86_OPTS} )
+		arm? ( ${ARM_OPTS} )
 		x86? ( ${X86_OPTS} )
 		ppc? ( ${PPC_OPTS} )
 		ppc64? ( ${PPC_OPTS} )
@@ -63,8 +71,8 @@ RDEPEND="|| (
 		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? (
+		!amd64? ( !arm? ( !x86? ( !ppc? ( !ppc64? ( !amd64-linux? ( !x86-linux? ( !x64-solaris? ( !x86-solaris? ( !sparc-solaris? ( !sparc64-solaris? (
 			${COMMON_OPTS}
-		) ) ) ) ) ) ) ) ) )
+		) ) ) ) ) ) ) ) ) ) )
 	)"
 DEPEND=""