diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index 0020307..e539d1f 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.8 2011/12/18 09:52:17 sera Exp $
 
+  09 Jul 2015; Mario Fetka <mario.fetka@gmail.com>
+  oracle-jre-bin-1.8.0.33.ebuild:
+  Correct decompress for x86
+
 *oracle-jre-bin-1.7.0.75 (09 Jul 2015)
 *oracle-jre-bin-1.8.0.33 (09 Jul 2015)
 
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 7bfc6fa..2ee445c 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -20,6 +20,6 @@ DIST ejre-7u75-fcs-b13-linux-i586-headless-18_dec_2014.tar.gz 33272151 SHA256 1f
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
 EBUILD oracle-jre-bin-1.7.0.71.ebuild 4826 SHA256 fadeac5c5e5d61f313fdd304486b727d4bee6d469f840fe94755d88b364112f9 SHA512 b84f2a912e03d49ae5aa3c8acf9e441395f886c51af7b666c31b8454bc877ad8cd4302fb1b195eae32c5cc70227c35058b72485d1d02d072a1ae668a80c8232b WHIRLPOOL 23fab2e331c8edc035a61038fd0a2ef7e55b7a7d70ac96f77dc86f79d0b53d37dbb7e582a24d58409e09da3bb0215ae371117358cf2b7e898d94a5ac5040058c
 EBUILD oracle-jre-bin-1.7.0.75.ebuild 4826 SHA256 b5a45c0ea2dbbb0e1223da07849b667cf8c89b04c217ef8067a0f9d215e11293 SHA512 8db294f8433eb55952bbcc59542bf4ea078c8c28cf925ebeb2eb063a9ecb52567cdbb0f5bab165668388c1351ce2d8810fb2396d2fc305b41a7075b350a28727 WHIRLPOOL 7d21f308db542319c678c361f16614b64a946067b01831d3cb6b83d8cf2a30f61f16a2e72454ba6437f08db0bdf4e28202e42c20d878d32d6daef4dd6853f51d
-EBUILD oracle-jre-bin-1.8.0.33.ebuild 6425 SHA256 481f3c1b577ae7bbb9e7e52d3fb37f99afe466a51b459431131452a73ee902f6 SHA512 3915749c84575261e0ca99f687e149e8669561e02b0a8da1b00549a94b3345b74f62b235aaf248f55bb4725b5b7a852d0b285e9e720071347054b57968d65ed1 WHIRLPOOL f276518b633b0a80e20d2159a644a99215b05b43b20ae7c185355c60a3ec4895a12400d5e98480d2ebd1bad6cf2e99ef44a1af6e37fb8e7d838d1af17c78d666
-MISC ChangeLog 3781 SHA256 4c3587da7b622851f1b70abc9d6e38aae7cf82a7b6036b23754c070dca519b39 SHA512 18fabc8b72c9d48fe77f6c98df8b4e00c8bb66b90fb7cc9025fb5285605913dd229eed7d6343cfea14af834ef62a21cab7ee163865b46aa21c637be246c0f00f WHIRLPOOL f31a6fc018d4a801100aeabbf87c46e1c2398ab79de7facdbb0cc992f64af5672179902be38a82e62ab07042fdf17b3886525562ab572d5172c26c25613257b9
+EBUILD oracle-jre-bin-1.8.0.33.ebuild 5511 SHA256 ac87fa250849e440e5c7b1fc598850ed27f3fa0604f6b146cd4f6cbe747b0b38 SHA512 e848ecefb43194db24e001bf2cf6168923a77056b5254ef837e9fa9877456763e73222966c9984e1590f35bd65810e921271ed8006dabfa965c0ac8dc4503af0 WHIRLPOOL 81a9e675abc04b156c25f5af07bdb18c010d546b0290d0808e981bd76d4d9cb7235358150dc27d173a6488c35668377e6c3ce91ac2c03f51eeff8d16ea00e062
+MISC ChangeLog 3896 SHA256 5f8bcc355a723bedf7a4bc08b364b9e7f95446a2b9b31e42980a9117ad765603 SHA512 713081b0705a9a87931aec2af73a9e2d09c01a45d65c58a4aa5856a1457758d1e7d5d3f4e91fe6c88df57462530bd05a50426d323b883465224a51f4dc8c0ea3 WHIRLPOOL f0a44e0269a131a78fdf2abc81d5e7c28a20e497b42ead32678b5cae3aef2c03852460e4f5e6d82eab1cd21bc6b3791c7fec35fcaf37ce23b729bed33980c5e0
 MISC metadata.xml 446 SHA256 6c1b5ea55c7570c8ebdc2c59ebdd09a50fd3704202ba4d0210e07161d0be2d0f SHA512 4443bb556d293a8a7cc98f5956203b355255820c1d7b3650c75adc04c0c0e10fffd7751f22f2111a2f43c8dc451ba35719a94c25223fad5559d88d9701673ffe WHIRLPOOL 7a6430e9039f2a8d03f5874eea63e980998ee0756a1df4d15cb85f8afafcacc67ccd33b34f3cfe186586ebf7245b5b1760317e2a3cfe0dadd6da693a7e39203e
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.33.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.33.ebuild
index b755854..819ae6a 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.33.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.33.ebuild
@@ -30,13 +30,14 @@ DESCRIPTION="Oracle's Java SE Runtime Environment"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 SRC_URI="
 	x86? ( ${X86_AT} )
+	amd64? ( ${X86_AT} )
 	arm? ( ${ARM_SF_AT} ${ARM_HF_AT} )
 	jce? ( ${JCE_FILE} )"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.8"
 KEYWORDS="arm x86"
-IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
+IUSE="X alsa fontconfig jce pax_kernel selinux"
 
 RESTRICT="fetch strip"
 QA_PREBUILT="*"
@@ -107,6 +108,8 @@ src_unpack() {
 		else
 			unpack ${ARM_SF_AT}
 		fi
+	else
+		unpack ${X86_AT}
 	fi
 
 	if use jce; then
@@ -141,16 +144,9 @@ src_install() {
 			lib/i386/libjavaplugin_nscp*.so
 		rm -vrf plugin/i386
 	fi
-	# Without nsplugin flag, also remove the new plugin
-	local arch=${ARCH};
-	use x86 && arch=i386;
-	if ! use nsplugin; then
-		rm -vf lib/${arch}/libnpjp2.so \
-			lib/${arch}/libjavaplugin_jni.so
-	fi
 
 	dodir "${dest}"
-	cp -pPR	bin lib man "${ddest}" || die
+	cp -pPR	bin lib "${ddest}" || die
 
 	# This needs to be done before CDS - #215225
 	java-vm_set-pax-markings "${ddest}"
@@ -188,24 +184,6 @@ src_install() {
 			"${dest}"/lib/security/local_policy.jar
 	fi
 
-	if use nsplugin; then
-		install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-		-e "s#Application;##" \
-		-e "/Encoding/d" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
 	# Prune all fontconfig files so libfontconfig will be used and only install
 	# a Gentoo specific one if fontconfig is disabled.
 	# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html