diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index d8134b25b21..5811f522e5d 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -3,7 +3,7 @@
 _isl_version=0.16
 pkgname=gcc6
 version=6.5.0
-revision=1
+revision=2
 _majorver="${version%%.*}"
 _minorver="${version%.*}"
 create_wrksrc=yes
@@ -26,7 +26,7 @@ skip_extraction="ecj-4.9.jar"
 nopie=yes
 lib32disabled=yes
 nocross=yes
-python_version=2 #unverified
+repository=bootstrap
 
 subpackages="gcc6-gcj gcc6-gcj-ecj libgcj-devel libgcj gcc6-gcj-jdk-compat"
 
@@ -206,6 +206,9 @@ do_install() {
 
 	# Remove python stuff
 	rm -rf ${DESTDIR}/usr/share/gcc-${version}/python
+	rm -f ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/*.py
+	rm -f ${DESTDIR}/usr/bin/aot-compile-6
+	rm -f ${DESTDIR}/usr/share/man/man1/aot-compile-6.1
 
 	# Avoid conflict with gcc
 	mv ${DESTDIR}/usr/lib/libcc1* ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}
@@ -251,13 +254,13 @@ gcc6-gcj_package() {
 		for f in gcj jv-convert gjarsigner gjar grmic jcf-dump \
 			gtnameserv gcjh gnative2ascii gserialver gkeytool \
 			gij grmiregistry grmid gorbd gcj-dbtool gjavah \
-			gc-analyze gappletviewer rebuild-gcj-db aot-compile; do
+			gc-analyze gappletviewer rebuild-gcj-db; do
 			vmove usr/bin/${f}-${_majorver}
 		done
 		for f in gcj jv-convert gjarsigner gjar grmic jcf-dump gjdoc \
 			gtnameserv gcjh gnative2ascii gserialver gkeytool \
 			gij grmiregistry grmid gorbd gcj-dbtool gjavah \
-			gc-analyze gappletviewer rebuild-gcj-db aot-compile; do
+			gc-analyze gappletviewer rebuild-gcj-db; do
 			if [ -f ${DESTDIR}/usr/share/man/man1/${f}-${_majorver}.1 ]; then
 				vmove usr/share/man/man1/${f}-${_majorver}.1
 			fi