diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 1c88756199cf..16e2b8745717 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -138,9 +138,10 @@ post-install: fake-manpages
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/lib-org-*.la
+	# Handle target libraries, libexec binaries, and GCJ include files.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
@@ -148,6 +149,7 @@ post-install: fake-manpages
 	fi
 .endfor
 	(${ECHO_CMD} "@unexec rmdir %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
+	(${ECHO_CMD} "@unexec rmdir %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index b9f9e044d303..aa0121de78ef 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -25,32 +25,17 @@ bin/jcf-dump40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%lib/lib-org-xml-sax.a
+%%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-include/mf-runtime.h
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jc1
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/jvgenmain
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1obj
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+include/mf-runtime.h
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-