Index: gcc/Makefile
===================================================================
--- gcc/Makefile
+++ gcc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	5.4.0
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 
@@ -34,6 +35,7 @@
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		BOOTSTRAP GRAPHITE
 OPTIONS_DEFINE_i386=	JAVA
@@ -130,6 +132,8 @@
 RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
+JAVA_USES=		python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 LANGUAGES:=	${LANGUAGES},java
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
Index: gcc5/Makefile
===================================================================
--- gcc5/Makefile
+++ gcc5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
@@ -34,6 +34,7 @@
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
+INSTALL_TARGET=		install-strip
 
 OPTIONS_DEFINE=		BOOTSTRAP GRAPHITE
 OPTIONS_DEFINE_i386=	JAVA
@@ -131,6 +132,8 @@
 RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
+JAVA_USES=	python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 LANGUAGES:=	${LANGUAGES},java
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
Index: gcc6-devel/Makefile
===================================================================
--- gcc6-devel/Makefile
+++ gcc6-devel/Makefile
@@ -31,7 +31,7 @@
 # Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y
 # for these three.
 DISTVERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
-PORTREVISION=	1
+PORTREVISION=	2
 GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 sparc64 arm armv6
@@ -39,6 +39,7 @@
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		BOOTSTRAP GRAPHITE
 OPTIONS_DEFINE_i386=	JAVA
@@ -135,6 +136,8 @@
 		zip:archivers/zip
 RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
+JAVA_USES=	python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
 INFO+=		gcc${SUFFIX}/cp-tools \
Index: gcc6/Makefile
===================================================================
--- gcc6/Makefile
+++ gcc6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	6.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}
@@ -33,6 +33,7 @@
 USE_BINUTILS=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
+INSTALL_TARGET=		install-strip
 
 OPTIONS_DEFINE=		BOOTSTRAP GRAPHITE
 OPTIONS_DEFINE_i386=	JAVA
@@ -131,6 +132,8 @@
 RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
+JAVA_USES=	python shebangfix
+SHEBANG_FILES=	libjava/contrib/aot-compile.in
 LANGUAGES:=	${LANGUAGES},java
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj