diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 8d65e7b..7b8b6c3 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Dec 2011; Mario Fetka <mario.fetka@gmail.com> sun-jre-bin-1.6.0.27.ebuild:
+  move detect to unpack
+
   27 Dec 2011; Mario Fetka <mario.fetka@gmail.com> sun-jre-bin-1.6.0.27.ebuild:
   rework chost detect
 
diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index e002e37..b18925d 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -3,6 +3,6 @@ AUX sun-jre-bin-1.6.env 936 RMD160 830d1fee15dc2ba8dab9b4c78d2b072ba5e29f0f SHA1
 DIST ejre-1_6_0_27-fcs-b07-linux-arm-sflt-eabi-headless-18_jul_2011.tar.gz 27858955 RMD160 a47a72111b531ef750bfd8f9ddec24ad408cdcda SHA1 90eeda6bc1cb11fbc4460e5644de7d35a2de3681 SHA256 55e063836f3ea5e98f020fbc44898c89b74f2770f29b286f27fbac30e0ad4a4d
 DIST ejre-1_6_0_27-fcs-b07-linux-arm-vfp-eabi-headful-18_jul_2011.tar.gz 34316063 RMD160 6f2adbbd0f206f920f1beb1ced6e7ff462841dfa SHA1 3a85b0df7f0c8967a5801615f90293b76ce0fa7f SHA256 d65f89fd537b4c912348b3f651ca6fb6c7726115b6882440e10b95f52ed681f5
 DIST ejre-1_6_0_27-fcs-b07-linux-arm-vfp-eabi-headless-18_jul_2011.tar.gz 27726930 RMD160 398d69394cf0caba9f78b749c806aa6545f21535 SHA1 bf66081cca44e008cf1d9d576fcc39c88d9232cf SHA256 d8b02bd16c95435d9c460cea060bc10b6eda00a2e8864d6412074903dd73243c
-EBUILD sun-jre-bin-1.6.0.27.ebuild 3604 RMD160 7af8f404d161ad6ec8c43de21156cc960e905452 SHA1 aaab689690e93a563efa29288bc2485b7c703416 SHA256 2e4bcbfffff928d9da64f205ac2e96c82f0f994b77ebe878ad5ea1afe38918b6
-MISC ChangeLog 1583 RMD160 59d8c84ceec271042e98b2bfd965a0f040683bfa SHA1 61705e78b066be5f1d8364a96ec6a7f88567ac48 SHA256 d282a6c6b15e500da3f9099ca9dbd7833f9afa95b820927cc340914a4dca945e
+EBUILD sun-jre-bin-1.6.0.27.ebuild 3288 RMD160 f11851ddec44ed2b0659f2d3c7f9d3b1baeb975f SHA1 0b7a4243bcb96ebd95dbd0835afe2be9e45df001 SHA256 754e8db6fbac28425dd5c17fb759fc0403ad3da1c280842327096f64f530599b
+MISC ChangeLog 1688 RMD160 bc02f1fe82ae889fe1028fa19905a2c945208b16 SHA1 c154ba39cac0a55b5ca01fc579bcc82b865506f6 SHA256 cce21f6ae029a88fe0e5ad95efbf1b878745ab005d5a747aaa8119f6f563321a
 MISC metadata.xml 349 RMD160 ae6db154651b0c2b160e1e6956fb722cb52f2e8b SHA1 219312b9ae33153d205b514009927531ee14b93a SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild
index 6680548..2fb51b9 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.27.ebuild
@@ -17,21 +17,7 @@ ARMV7_AT="ejre-${MY_PV}-fcs-b${BUILD}-linux-arm-vfp-eabi-headful-${BUILDDATE}${S
 DESCRIPTION="Sun's Java SE Embedded Runtime Environment"
 HOMEPAGE="http://www.oracle.com/technetwork/java/embedded/overview/index.html"
 URL_BASE="http://download.java.net/dlj/binaries"
-
-einfo ${CHOST/-*/}
-
-if [[ ${CHOST/-*/} -eq "armv5tel" ]]; then
-	SRC_URI="arm? ( ${URL_BASE}/${ARMV5_AT} )"
-elif [[ ${CHOST/-*/} -eq "armv6j" ]]; then
-	SRC_URI="arm? ( ${URL_BASE}/${ARMV6_AT} )"
-elif [[ ${CHOST/-*/} -eq "armv7a" ]]; then
-	SRC_URI="arm? ( ${URL_BASE}/${ARMV7_AT} )"
-fi
-
-# trick CHOST="arm" ebuild sun-jre-bin-1.6.0.27.ebuild for digesting all the source packages
-if [[ ${CHOST} -eq "all" ]]; then
-	SRC_URI="amd64? ( ${URL_BASE}/${ARMV5_AT} ${URL_BASE}/${ARMV6_AT} ${URL_BASE}/${ARMV7_AT} )"
-fi
+SRC_URI="arm? ( ${URL_BASE}/${ARMV5_AT} ${URL_BASE}/${ARMV6_AT} ${URL_BASE}/${ARMV7_AT} )"
 
 SLOT="1.6"
 LICENSE="ejre-6"
@@ -57,6 +43,19 @@ QA_TEXTRELS_ARM="opt/${P}/lib/arm/client/libjvm.so
 
 S="${WORKDIR}/ejre${MY_PVR}"
 
+
+src_unpack() {
+	einfo "Unpacking for arch ${CHOST/-*/}"
+
+	if [[ ${CHOST/-*/} -eq "armv5tel" ]]; then
+		unpack ${ARMV5_AT}
+	elif [[ ${CHOST/-*/} -eq "armv6j" ]]; then
+		unpack ${ARMV6_AT}
+	elif [[ ${CHOST/-*/} -eq "armv7a" ]]; then
+		unpack ${ARMV7_AT}
+	fi
+}
+
 src_compile() {
 	# Set PaX markings on all JDK/JRE executables to allow code-generation on
 	# the heap by the JIT compiler. This has to be done before CDS - #215225
@@ -107,13 +106,7 @@ pkg_postinst() {
 pkg_nofetch() {
 	einfo "This files require you to register at ${HOMEPAGE} (free account)"
 	einfo "Please download following file:"
-	if [[ ${CHOST/-*/} -eq "armv5tel" ]]; then
-		einfo " - ${ARMV5_AT}"
-	elif [[ ${CHOST/-*/} -eq "armv6j" ]]; then
-		einfo " - ${ARMV6_AT}"
-	elif [[ ${CHOST/-*/} -eq "armv7a" ]]; then
-		einfo " - ${ARMV7_AT}"
-	fi
+	einfo " - ${ARMV5_AT} - ${ARMV6_AT} - ${ARMV7_AT}"
 	einfo "from ${HOMEPAGE}"
-	einfo "and place them in ${DISTDIR}"
+	einfo "and place them into ${DISTDIR}"
 }
\ No newline at end of file