diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index dba54069e3f1..5470f5c424c4 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc47
-PORTVERSION=	4.7.4.20140329
+PORTVERSION=	4.7.4.20140405
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
@@ -135,6 +135,8 @@ full-regression-test: build
 post-install:
 	${RM} -f ${STAGEDIR}${TARGLIB}/*.la
 	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1.gz
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 91e9ac5fb04c..a070ed07d363 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.7-20140329.tar.bz2) = 9bb6d92648f5975efffdbe45b8d574b390f965dad8638177b4c85e918bf6e6be
-SIZE (gcc-4.7-20140329.tar.bz2) = 78908968
+SHA256 (gcc-4.7-20140405.tar.bz2) = 6454f409745976b3ca2ea9e0d05a0161327ae7aaaf22845e813d69de37a7c212
+SIZE (gcc-4.7-20140405.tar.bz2) = 78909718
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 0c067e997773..3dbd4b3602e4 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -52,7 +52,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
 %%JAVA%%bin/gtnameserv%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.7.pc
 %%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz
 %%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz
@@ -75,7 +74,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
 %%JAVA%%man/man1/gtnameserv%%SUFFIX%%.1.gz
 %%JAVA%%man/man1/jcf-dump%%SUFFIX%%.1.gz
 %%JAVA%%man/man1/jv-convert%%SUFFIX%%.1.gz
-%%JAVA%%man/man1/rebuild-gcj-db%%SUFFIX%%.1.gz
 %%JAVA%%man/man3/ffi%%SUFFIX%%.3.gz
 %%JAVA%%man/man3/ffi_call%%SUFFIX%%.3.gz
 %%JAVA%%man/man3/ffi_prep_cif%%SUFFIX%%.3.gz