diff --git a/srcpkgs/gcc/gcc-c++-multilib.template b/srcpkgs/gcc/gcc-c++-multilib.template
index 74e610edc70..2a612043ea5 100644
--- a/srcpkgs/gcc/gcc-c++-multilib.template
+++ b/srcpkgs/gcc/gcc-c++-multilib.template
@@ -7,11 +7,12 @@ long_desc="
  On architectures with multilib support, the package contains files and
  dependencies for the non-default multilib architecture(s)."
 
+revision=1
 noverifyrdeps=yes
 
-Add_dependency run gcc-c++		">=${version}"
-Add_dependency run gcc-multilib		">=${version}"
-Add_dependency run libstdc++32-devel	">=${version}"
+Add_dependency run gcc-c++ 		">=${_majorver}"
+Add_dependency run gcc-multilib 	">=${_majorver}"
+Add_dependency run libstdc++32-devel 	">=${_majorver}"
 
 do_install() {
 	local libmddir="usr/lib/gcc/${_triplet}/${_majorver}"
diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index b7ca817ad90..7faf9b1b9f4 100644
--- a/srcpkgs/gcc/gcc-c++.template
+++ b/srcpkgs/gcc/gcc-c++.template
@@ -5,9 +5,11 @@ long_desc="${long_desc}
 
  This package contains GCC C++ support."
 
+revision=1
+
 Add_dependency run libelf
-Add_dependency run gcc			">=$version"
-Add_dependency run libstdc++-devel	">=$version"
+Add_dependency run gcc			">=${_majorver}"
+Add_dependency run libstdc++-devel	">=${_majorver}"
 
 do_install()
 {
diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template
index fe25b2fa8a7..1a72afcdce2 100644
--- a/srcpkgs/gcc/gcc-fortran.template
+++ b/srcpkgs/gcc/gcc-fortran.template
@@ -5,11 +5,10 @@ long_desc="${long_desc}
 
  This package contains the GCC Fortran frontend."
 
-revision=1
+revision=2
 
-Add_dependency run libgcc	">=$version"
-Add_dependency run libgfortran	">=$version"
-Add_dependency run gcc		">=$version"
+Add_dependency run gcc			">=${_majorver}"
+Add_dependency run libgfortran-devel	">=${_majorver}"
 
 do_install() {
 	for f in gfortran ${_triplet}-gfortran; do
diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template
index 99a64eed3a0..a6727477ec0 100644
--- a/srcpkgs/gcc/gcc-go.template
+++ b/srcpkgs/gcc/gcc-go.template
@@ -5,8 +5,10 @@ long_desc="${long_desc}
 
  This package contains the GCC Go frontend."
 
-Add_dependency run gcc		">=$version"
-Add_dependency run libgo-devel	">=$version"
+revision=1
+
+Add_dependency run gcc		">=${_majorver}"
+Add_dependency run libgo-devel	">=${_majorver}"
 
 do_install()
 {
diff --git a/srcpkgs/gcc/gcc-multilib.template b/srcpkgs/gcc/gcc-multilib.template
index 8cbf24b7e90..530da9c1c0f 100644
--- a/srcpkgs/gcc/gcc-multilib.template
+++ b/srcpkgs/gcc/gcc-multilib.template
@@ -7,11 +7,12 @@ long_desc="
  On architectures with multilib support, the package contains files and
  dependencies for the non-default multilib architecture(s)."
 
+revision=1
 noverifyrdeps=yes
 
-Add_dependency run gcc		">=${version}"
-Add_dependency run libgcc32	">=${version}"
-Add_dependency run libgomp32	">=${version}"
+Add_dependency run gcc		">=${_majorver}"
+Add_dependency run libgcc32	">=${_majorver}"
+Add_dependency run libgomp32	">=${_majorver}"
 Add_dependency run zlib32
 Add_dependency run glibc32-devel
 
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index 6667fff8cef..724b351b16d 100644
--- a/srcpkgs/gcc/gcc-objc++.template
+++ b/srcpkgs/gcc/gcc-objc++.template
@@ -5,13 +5,13 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C++ support."
 
+revision=1
 
 Add_dependency run libelf
-Add_dependency run gcc-c++	">=$version"
-Add_dependency run gcc-objc	">=$version"
+Add_dependency run gcc-c++	">=${_majorver}"
+Add_dependency run gcc-objc	">=${_majorver}"
 
-do_install()
-{
+do_install() {
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus \
 		usr/lib/gcc/${_triplet}/${_majorver}
 }
diff --git a/srcpkgs/gcc/gcc-objc-multilib.template b/srcpkgs/gcc/gcc-objc-multilib.template
index 3d1b985eebf..09c98be165d 100644
--- a/srcpkgs/gcc/gcc-objc-multilib.template
+++ b/srcpkgs/gcc/gcc-objc-multilib.template
@@ -8,11 +8,12 @@ long_desc="
  On architectures with multilib support, the package contains files and
  dependencies for the non-default multilib architecture(s)."
 
+revision=1
 noverifyrdeps=yes
 
-Add_dependency run gcc-multilib	">=${version}"
-Add_dependency run gcc-objc	">=${version}"
-Add_dependency run libobjc32	">=${version}"
+Add_dependency run gcc-multilib	">=${_majorver}"
+Add_dependency run gcc-objc	">=${_majorver}"
+Add_dependency run libobjc32	">=${_majorver}"
 
 do_install() {
 	local libmddir="/usr/lib/gcc/${_triplet}/${_majorver}"
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index 793b0cf63fc..50627399c62 100644
--- a/srcpkgs/gcc/gcc-objc.template
+++ b/srcpkgs/gcc/gcc-objc.template
@@ -5,13 +5,13 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C support."
 
+revision=1
 
 Add_dependency run libelf
-Add_dependency run gcc		">=$version"
-Add_dependency run libobjc	">=$version"
+Add_dependency run gcc		">=${_majorver}"
+Add_dependency run libobjc	">=${_majorver}"
 
-do_install()
-{
+do_install() {
 	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/libgfortran-devel.template b/srcpkgs/gcc/libgfortran-devel.template
index 7ac0e2b2909..5e86010c5d9 100644
--- a/srcpkgs/gcc/libgfortran-devel.template
+++ b/srcpkgs/gcc/libgfortran-devel.template
@@ -5,11 +5,11 @@ long_desc="${long_desc}
 
  This package contains the GCC Fortran headers and static libraries."
 
+revision=1
 
-Add_dependency run libgfortran ">=${version}"
+Add_dependency run libgfortran ">=${_majorver}"
 
-do_install()
-{
+do_install() {
 	# create version -> major symlink
 	vmkdir usr/lib/gcc/${_triplet}/${_majorver}
 	ln -sf /usr/lib/gcc/${_triplet}/${_majorver} \
diff --git a/srcpkgs/gcc/libgfortran.template b/srcpkgs/gcc/libgfortran.template
index 1b71d951f6e..944faad2402 100644
--- a/srcpkgs/gcc/libgfortran.template
+++ b/srcpkgs/gcc/libgfortran.template
@@ -5,10 +5,9 @@ long_desc="${long_desc}
 
  This package contains the GCC Fortran shared library."
 
-Add_dependency run libgcc ">=$version"
+revision=1
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libgfortran.so*" usr/lib
 	vmove usr/lib/libgfortran.spec usr/lib
 	vinstall COPYING.RUNTIME 644 \
diff --git a/srcpkgs/gcc/libgo-devel.template b/srcpkgs/gcc/libgo-devel.template
index 23f7fd73f85..2ab4848a5b7 100644
--- a/srcpkgs/gcc/libgo-devel.template
+++ b/srcpkgs/gcc/libgo-devel.template
@@ -5,10 +5,11 @@ long_desc="${long_desc}
 
  This package contains the GCC Go headers and static libraries."
 
-Add_dependency run libgo ">=${version}"
+revision=1
 
-do_install()
-{
+Add_dependency run libgo ">=${_majorver}"
+
+do_install() {
 	vmove usr/lib/libgo.a usr/lib
 	vmove usr/lib/libgobegin.a usr/lib
 }
diff --git a/srcpkgs/gcc/libgo.template b/srcpkgs/gcc/libgo.template
index e956d6f9546..402372ab552 100644
--- a/srcpkgs/gcc/libgo.template
+++ b/srcpkgs/gcc/libgo.template
@@ -5,9 +5,7 @@ long_desc="${long_desc}
 
  This package contains the GO shared library."
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libgo.so*" usr/lib
 	vinstall COPYING.RUNTIME 644 \
 		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
diff --git a/srcpkgs/gcc/libgomp-devel.template b/srcpkgs/gcc/libgomp-devel.template
index 1da084ec442..429dfb76266 100644
--- a/srcpkgs/gcc/libgomp-devel.template
+++ b/srcpkgs/gcc/libgomp-devel.template
@@ -6,10 +6,11 @@ long_desc="${long_desc}
  This package contains GCC OpenMP headers and static libraries
  for OpenMP v3.0 support."
 
-Add_dependency run libgomp	">=${version}"
+revision=1
 
-do_install()
-{
+Add_dependency run libgomp	">=${_majorver}"
+
+do_install() {
 	vmove usr/lib/libgomp.a usr/lib
 	vmove usr/share/info/libgomp.info usr/share/info
 	touch ${DESTDIR}/usr/share/info/dir
diff --git a/srcpkgs/gcc/libgomp.template b/srcpkgs/gcc/libgomp.template
index 7d02ec5162e..e6843d7ce86 100644
--- a/srcpkgs/gcc/libgomp.template
+++ b/srcpkgs/gcc/libgomp.template
@@ -6,10 +6,9 @@ long_desc="${long_desc}
  This package contains GCC shared support library which is needed
  for OpenMP v3.0 support."
 
-Add_dependency run libgcc	">=${version}"
+revision=1
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libgomp*.so*" usr/lib
 	vmove usr/lib/libgomp.spec usr/lib
 	vinstall COPYING.RUNTIME 644 \
diff --git a/srcpkgs/gcc/libmudflap-devel.template b/srcpkgs/gcc/libmudflap-devel.template
index adf542e9357..156970adfdc 100644
--- a/srcpkgs/gcc/libmudflap-devel.template
+++ b/srcpkgs/gcc/libmudflap-devel.template
@@ -6,9 +6,10 @@ long_desc="${long_desc}
  This package contains GCC mudflap headers and static libraries for
  building mudflap-instrumented programs."
 
-Add_dependency run libmudflap	">=$version"
+revision=1
 
-do_install()
-{
+Add_dependency run libmudflap	">=${_majorver}"
+
+do_install() {
 	vmove "usr/lib/libmudflap*.a" usr/lib
 }
diff --git a/srcpkgs/gcc/libmudflap.template b/srcpkgs/gcc/libmudflap.template
index e9a96b2dd9d..52754779901 100644
--- a/srcpkgs/gcc/libmudflap.template
+++ b/srcpkgs/gcc/libmudflap.template
@@ -6,10 +6,9 @@ long_desc="${long_desc}
  This package contains GCC shared support library which is needed
  for mudflap support."
 
-Add_dependency run libgcc	">=${version}"
+revision=1
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libmudflap*.so*" usr/lib
 	vinstall COPYING.RUNTIME 644 \
 		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
diff --git a/srcpkgs/gcc/libobjc-devel.template b/srcpkgs/gcc/libobjc-devel.template
index 9befea145f1..96a80cf3564 100644
--- a/srcpkgs/gcc/libobjc-devel.template
+++ b/srcpkgs/gcc/libobjc-devel.template
@@ -6,9 +6,10 @@ long_desc="${long_desc}
  This package contains GCC Objective-C headers and static libs, to
  build Objective-C programs."
 
-Add_dependency run libobjc	">=$version"
+revision=1
 
-do_install()
-{
+Add_dependency run libobjc	">=${_majorver}"
+
+do_install() {
 	vmove "usr/lib/libobjc.*a" usr/lib
 }
diff --git a/srcpkgs/gcc/libobjc.template b/srcpkgs/gcc/libobjc.template
index 917352c0b9b..2ed3a901d7f 100644
--- a/srcpkgs/gcc/libobjc.template
+++ b/srcpkgs/gcc/libobjc.template
@@ -6,9 +6,7 @@ long_desc="${long_desc}
  This package contains GCC Objective-C shared support library which is needed
  to run Objective-C dynamically linked programs."
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libobjc.so*" usr/lib
 	vinstall COPYING.RUNTIME 644 \
 		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
diff --git a/srcpkgs/gcc/libquadmath-devel.template b/srcpkgs/gcc/libquadmath-devel.template
index e09b2e93733..d80b21f7ed7 100644
--- a/srcpkgs/gcc/libquadmath-devel.template
+++ b/srcpkgs/gcc/libquadmath-devel.template
@@ -6,10 +6,11 @@ long_desc="${long_desc}
  This package contains GCC quadmath headers and static libraries for
  building mudflap-instrumented programs."
 
-Add_dependency run libquadmath	">=$version"
+revision=1
 
-do_install()
-{
+Add_dependency run libquadmath	">=${_majorver}"
+
+do_install() {
 	vmove "usr/lib/libquadmath*.a" usr/lib
 	vmove usr/share/info/libquadmath.info usr/share/info
 	touch ${DESTDIR}/usr/share/info/dir
diff --git a/srcpkgs/gcc/libquadmath.template b/srcpkgs/gcc/libquadmath.template
index 51440f16604..ea309263308 100644
--- a/srcpkgs/gcc/libquadmath.template
+++ b/srcpkgs/gcc/libquadmath.template
@@ -5,10 +5,9 @@ long_desc="${long_desc}
 
  This package contains the GCC quadmath shared library."
 
-Add_dependency run libgcc ">=$version"
+revision=1
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libquadmath.so*" usr/lib
 	vinstall COPYING.RUNTIME 644 \
 		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
diff --git a/srcpkgs/gcc/libssp-devel.template b/srcpkgs/gcc/libssp-devel.template
index 18558073560..25d87edf0eb 100644
--- a/srcpkgs/gcc/libssp-devel.template
+++ b/srcpkgs/gcc/libssp-devel.template
@@ -6,15 +6,13 @@ long_desc="${long_desc}
  This package contains the Stack Smashing Protection development
  files provided by GCC."
 
+revision=1
 
 Add_dependency run glibc-devel
-Add_dependency run libssp
+Add_dependency run libssp	">=${_majorver}"
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libssp*.a" usr/lib
-	vmove usr/lib/libssp.so usr/lib
-
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/include/ssp \
 		usr/lib/gcc/${_triplet}/${_majorver}/include
 }
diff --git a/srcpkgs/gcc/libssp.template b/srcpkgs/gcc/libssp.template
index 99df9633363..31e0cbfc9ac 100644
--- a/srcpkgs/gcc/libssp.template
+++ b/srcpkgs/gcc/libssp.template
@@ -6,10 +6,10 @@ long_desc="${long_desc}
  This package contains the Stack Smashing Protection shared library
  provided by GCC."
 
+revision=1
 
-do_install()
-{
-	vmove "usr/lib/libssp.so.*" usr/lib
+do_install() {
+	vmove "usr/lib/libssp.so*" usr/lib
 	vinstall COPYING.RUNTIME 644 \
 		usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 }
diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template
index 020b0068a9f..c88780c9a33 100644
--- a/srcpkgs/gcc/libstdc++-devel.template
+++ b/srcpkgs/gcc/libstdc++-devel.template
@@ -6,11 +6,11 @@ long_desc="${long_desc}
  This package contains GCC Header files and libraries for
  C++ development."
 
+revision=1
 
-Add_dependency run libstdc++	">=$version"
+Add_dependency run libstdc++	">=${_majorver}"
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libstdc++.*a" usr/lib
 	vmove "usr/lib/libsupc++.*" usr/lib
 	vmove usr/include/c++ usr/include
diff --git a/srcpkgs/gcc/libstdc++.template b/srcpkgs/gcc/libstdc++.template
index 1b1c6a3c497..3433faa2b7b 100644
--- a/srcpkgs/gcc/libstdc++.template
+++ b/srcpkgs/gcc/libstdc++.template
@@ -6,10 +6,7 @@ long_desc="${long_desc}
  This package contains a rewritten standard compliant GCC Standard
  C++ library."
 
-
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/libstdc++.so*" usr/lib
 	vmove usr/share/locale/fr/LC_MESSAGES/libstdc++.mo \
 		usr/share/locale/fr/LC_MESSAGES
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 71a7e652479..fc67c43b0c8 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,7 +2,7 @@
 pkgname=gcc
 _majorver=4.6
 version=${_majorver}.3
-revision=1
+revision=2
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,10 +16,10 @@ long_desc="
  for ObjectiveC++ install gcc-objc++, for Go install gcc-go,
  for Fortran install gcc-fortran."
 
-Add_dependency run libgomp		">=${version}"
+Add_dependency run libgomp 		">=${_majorver}"
 Add_dependency run binutils
 Add_dependency run libelf
-Add_dependency run libssp-devel		">=${version}"
+Add_dependency run libssp-devel 	">=${_majorver}"
 
 Add_dependency build perl
 Add_dependency build flex