diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index 7b59c42e5fc..8693592a842 100644
--- a/srcpkgs/gcc/gcc-c++.template
+++ b/srcpkgs/gcc/gcc-c++.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains GCC C++ support."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run zlib
@@ -20,11 +20,6 @@ Add_dependency run libstdc++-devel	">=$version"
 
 do_install()
 {
-	# create version -> major symlink
-	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
-	ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
-
 	for f in g++ c++ ${_triplet}-g++ ${_triplet}-c++; do
 		vmove usr/bin/${f} usr/bin
 	done
diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template
index 139f8343bc0..9f06d989ce1 100644
--- a/srcpkgs/gcc/gcc-fortran.template
+++ b/srcpkgs/gcc/gcc-fortran.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the GCC Fortran frontend."
 
-revision=1
+revision=2
 
 Add_dependency run libgcc	">=$version"
 Add_dependency run glibc
@@ -20,11 +20,6 @@ Add_dependency run gcc		">=$version"
 
 do_install()
 {
-	# create version -> major symlink
-	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
-	ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
-
 	for f in gfortran ${_triplet}-gfortran; do
 		vmove usr/bin/${f} usr/bin
 	done
diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template
index aa40e8b69ef..c703a797418 100644
--- a/srcpkgs/gcc/gcc-go.template
+++ b/srcpkgs/gcc/gcc-go.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the GCC Go frontend."
 
-revision=1
+revision=2
 
 Add_dependency run libgcc	">=$version"
 Add_dependency run glibc
@@ -21,11 +21,6 @@ Add_dependency run libgo-devel	">=$version"
 
 do_install()
 {
-	# create version -> major symlink
-	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
-	ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
-
 	for f in gccgo ${_triplet}-gccgo; do
 		vmove usr/bin/${f} usr/bin
 	done
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index 156e61320b1..3964ffd3d17 100644
--- a/srcpkgs/gcc/gcc-objc++.template
+++ b/srcpkgs/gcc/gcc-objc++.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C++ support."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run zlib
@@ -20,11 +20,6 @@ Add_dependency run gcc-objc	">=$version"
 
 do_install()
 {
-	# create version -> major symlink
-	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
-	ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
-
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus \
 		usr/lib/gcc/${_triplet}/${_majorver}
 }
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index 2083665cf28..c39f13ade3f 100644
--- a/srcpkgs/gcc/gcc-objc.template
+++ b/srcpkgs/gcc/gcc-objc.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C support."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run zlib
@@ -20,11 +20,6 @@ Add_dependency run libobjc	">=$version"
 
 do_install()
 {
-	# create version -> major symlink
-	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
-	ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
-
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/include/objc \
 		usr/lib/gcc/${_triplet}/${_majorver}/include
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1obj \
diff --git a/srcpkgs/gcc/libssp-devel.template b/srcpkgs/gcc/libssp-devel.template
index bb909c09bce..f6feaaecff6 100644
--- a/srcpkgs/gcc/libssp-devel.template
+++ b/srcpkgs/gcc/libssp-devel.template
@@ -6,18 +6,13 @@ long_desc="${long_desc}
  This package contains the Stack Smashing Protection development
  files provided by GCC."
 
-revision=1
+revision=2
 
 Add_dependency run glibc-devel
 Add_dependency run libssp
 
 do_install()
 {
-	# create version -> major symlink
-	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
-	ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
-
 	vmove "usr/lib/libssp*.a" usr/lib
 	vmove usr/lib/libssp.so usr/lib
 
diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template
index cc18e8e6b77..df3330bf4fd 100644
--- a/srcpkgs/gcc/libstdc++-devel.template
+++ b/srcpkgs/gcc/libstdc++-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains GCC Header files and libraries for
  C++ development."
 
-revision=1
+revision=2
 
 Add_dependency run libstdc++	">=$version"
 
@@ -14,7 +14,5 @@ do_install()
 {
 	vmove "usr/lib/libstdc++.*a" usr/lib
 	vmove "usr/lib/libsupc++.*" usr/lib
-	vmove usr/include/c++/${_majorver} usr/include/c++
-	ln -sf /usr/include/c++/${_majorver} \
-		${DESTDIR}/usr/include/c++/${version}
+	vmove usr/include/c++ usr/include
 }