diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 965fe1e7231..74f4cc671ee 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=4
+revision=5
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
@@ -421,6 +421,7 @@ gcc-go_package() {
 	lib32disabled=yes
 	depends="gcc>=${_minorver} libgo-devel>=${_minorver}"
 	short_desc+=" - Go compiler frontend"
+	nostrip_files="buildid cgo test2json vet"
 	pkg_install() {
 		for f in gccgo ${_triplet}-gccgo; do
 			vmove usr/bin/${f}
@@ -440,6 +441,7 @@ gcc-go-tools_package() {
 	depends="gcc-go>=${_minorver}"
 	short_desc+=" - Go tools"
 	conflicts="go>=0"
+	nostrip=yes
 	pkg_install() {
 		vmove usr/bin/go
 		vmove usr/bin/gofmt
@@ -536,6 +538,7 @@ libgfortran_package() {
 libgo-devel_package() {
 	depends="libgo>=${_minorver}"
 	short_desc+=" - Go library - development files"
+	nostrip=yes
 	pkg_install() {
 		vmove usr/lib/libgo.a
 		vmove usr/lib/libgobegin.a
@@ -546,6 +549,7 @@ libgo-devel_package() {
 
 libgo_package() {
 	short_desc+=" - Go library"
+	nostrip=yes
 	pkg_install() {
 		vmove "usr/lib/libgo.so*"
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION