diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template
index 92f62b45c3..7c5280a546 100644
--- a/srcpkgs/jre/template
+++ b/srcpkgs/jre/template
@@ -2,7 +2,7 @@
 pkgname=jre
 _extraversion=1.7.0
 version=7
-revision=2
+revision=3
 distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}/jre-${version}-linux-x64.tar.gz"
 build_style=custom-install
 short_desc="Oracle's Java Runtime Environment (JRE) - Version 7"
@@ -19,6 +19,8 @@ long_desc="
  improved support for dynamic and script languages, updates to security,
  internationalization and web standards and much more."
 
+# no i386...
+only_for_archs=x86_64
 gtk_iconcache_dirs="
 /usr/share/icons/hicolor
 /usr/share/icons/HighContrast
@@ -33,6 +35,7 @@ Add_dependency run libXtst
 Add_dependency run libXi
 Add_dependency run alsa-lib
 
+Add_dependency build coreutils
 Add_dependency build libXrender-devel
 Add_dependency build libXtst-devel
 Add_dependency build alsa-lib-devel
@@ -53,10 +56,7 @@ do_install()
 	vcopy		lib/desktop/mime usr/share
 	vcopy		lib/locale usr/share
 	vcopy		man usr/share
-
-	# Install mozilla-compatible browser plugin
-	vmkdir		usr/lib/mozilla/plugins
-	vinstall	lib/amd64/libnpjp2.so 755 usr/lib/mozilla/plugins	          
+	rm -rf		${DESTDIR}/usr/share/man/ja
 
 	# Install license(s)
 	vmkdir		usr/share/licenses/jre
@@ -75,12 +75,16 @@ do_install()
 	vmkdir		opt/java/jre
 	vcopy		bin opt/java/jre
 	vcopy		lib opt/java/jre
-	vcopy		plugin opt/java/jre
 	vcopy		release opt/java/jre
 	vcopy		Welcome.html opt/java/jre
 
-	rm -rf ${DESTDIR}/opt/java/jre/lib/desktop
-	rm -rf ${DESTDIR}/opt/java/jre/lib/locale
+	rm -rf		${DESTDIR}/opt/java/jre/lib/desktop
+	rm -rf		${DESTDIR}/opt/java/jre/lib/locale
+
+	# Install mozilla compatible plugin.
+	vmkdir		usr/lib/mozilla/plugins
+	cd ${DESTDIR}/usr/lib/mozilla/plugins && \
+		ln -sf	../../../../opt/java/jre/lib/amd64/libnpjp2.so .
 
 	# linker's config
         vmkdir etc/ld.so.conf.d
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 3f33e7d2e6..cf0f0ceea0 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -869,4 +869,13 @@ libsystemd-login.so.0		systemd
 libply.so.2			libplymouth		plymouth-devel
 libply-splash-graphics.so.2	libplymouth		plymouth-devel
 libply-splash-core.so.2		libplymouth		plymouth-devel
-
+libJdbcOdbc.so			jre
+libjli.so			jre
+libjvm.so			jre
+libawt.so			jre
+libjava.so			jre
+libnet.so			jre
+libnio.so			jre
+libmawt.so			jre
+libverify.so			jre
+libfontmanager.so		jre