diff -u gcc-4.4-4.4.6/debian/rules.parameters gcc-4.4-4.4.6/debian/rules.parameters
--- gcc-4.4-4.4.6/debian/rules.parameters
+++ gcc-4.4-4.4.6/debian/rules.parameters
@@ -2,9 +2,9 @@
 GCC_VERSION	:= 4.4.6
 NEXT_GCC_VERSION	:= 4.4.7
 BASE_VERSION	:= 4.4
-SOURCE_VERSION	:= 4.4.6-3maverick2
-DEB_VERSION	:= 4.4.6-3maverick2
-DEB_EVERSION	:= 1:4.4.6-3maverick2
+SOURCE_VERSION	:= 4.4.6-3maverick3
+DEB_VERSION	:= 4.4.6-3maverick3
+DEB_EVERSION	:= 1:4.4.6-3maverick3
 GPC_BASE_VERSION	:= 
 GDC_BASE_VERSION  := 
 DEB_GPC_VERSION	:= 
@@ -12,7 +12,7 @@
 DEB_SOVERSION	:= 4.4
 DEB_SOEVERSION	:= 1:4.4
 DEB_LIBGCC_SOVERSION	:= 1:4.4
-DEB_LIBGCC_VERSION	:= 1:4.4.6-3maverick2
+DEB_LIBGCC_VERSION	:= 1:4.4.6-3maverick3
 DEB_STDCXX_SOVERSION	:= 4.4
 DEB_GCJ_SOVERSION	:= 4.4
 PKG_GCJ_EXT	:= 10
diff -u gcc-4.4-4.4.6/debian/rules2 gcc-4.4-4.4.6/debian/rules2
--- gcc-4.4-4.4.6/debian/rules2
+++ gcc-4.4-4.4.6/debian/rules2
@@ -388,11 +388,12 @@
 endif
 
 ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 i386 kfreebsd-i386 kfreebsd-amd64))
-  #CONFARGS += --with-arch-32=i486
-  ifeq ($(distribution),Ubuntu)
+  ifneq (,$(filter $(distrelease),etch lenny dapper hardy))
+    CONFARGS += --with-arch-32=i486
+  else ifneq (,$(filter $(distrelease),squeeze wheezy sid jaunty karmic lucid))
     CONFARGS += --with-arch-32=i586
   else
-    CONFARGS += --with-arch-32=i586
+    CONFARGS += --with-arch-32=i686
   endif
 endif
 
diff -u gcc-4.4-4.4.6/debian/rules.defs gcc-4.4-4.4.6/debian/rules.defs
--- gcc-4.4-4.4.6/debian/rules.defs
+++ gcc-4.4-4.4.6/debian/rules.defs
@@ -97,9 +97,11 @@
   $(error Invalid architecure.)
 endif
 
-ifeq ($(distribution)-$(DEB_TARGET_ARCH),Ubuntu-i386)
-  DEB_TARGET_GNU_CPU := i486
-  DEB_TARGET_GNU_TYPE := i486-linux-gnu
+ifeq ($(DEB_TARGET_ARCH),i386)
+  ifneq (,$(filter $(distrelease),dapper hardy jaunty karmic lucid))
+    DEB_TARGET_GNU_CPU := i486
+    DEB_TARGET_GNU_TYPE := i486-linux-gnu
+  endif
 endif
 # including unversiond symlinks for binaries
 #with_unversioned = yes
@@ -270,16 +272,17 @@
 
 # build using fsf or linaro
 ifeq ($(distribution),Ubuntu)
+  ifeq (,$(filter $(distrelease),dapper hardy jaunty karmic lucid))
   ifeq (,$(findstring gnat, $(PKGSOURCE)))
   ifneq (,$(findstring $(DEB_TARGET_ARCH),amd64 armel armhf i386 powerpc))
     with_linaro_branch = yes
   endif
   endif
+  endif
 endif
 ifeq ($(DEB_TARGET_ARCH),armhf)
   with_linaro_branch := yes
 endif
-with_linaro_branch :=
 
 # check if we're building for armel or armhf
 ifeq ($(DEB_TARGET_ARCH),armhf)
diff -u gcc-4.4-4.4.6/debian/changelog gcc-4.4-4.4.6/debian/changelog
--- gcc-4.4-4.4.6/debian/changelog
+++ gcc-4.4-4.4.6/debian/changelog
@@ -1,4 +1,4 @@
-gcc-4.4 (4.4.6-3maverick2) maverick; urgency=low
+gcc-4.4 (4.4.6-3maverick3) maverick; urgency=low
 
   * Build for Ubuntu 10.04 LTS.
   * Disable the build from the Linaro branch (didn't exist for lucid).
diff -u gcc-4.4-4.4.6/debian/rules.d/binary-base.mk gcc-4.4-4.4.6/debian/rules.d/binary-base.mk
--- gcc-4.4-4.4.6/debian/rules.d/binary-base.mk
+++ gcc-4.4-4.4.6/debian/rules.d/binary-base.mk
@@ -3,6 +3,18 @@
 # ---------------------------------------------------------------------------
 # gcc-base
 
+ifneq (,$(filter $(distrelease), karmic))
+  additional_links = 4.4.1
+else ifneq (,$(filter $(distrelease),lucid))
+  additional_links = 4.4.3
+else ifneq (,$(filter $(distrelease),maverick))
+  additional_links = 4.4.4
+else ifneq (,$(filter $(distrelease),squeeze natty))
+  additional_links = 4.4.5
+else
+  additional_links =
+endif
+
 $(binary_stamp)-base: $(install_dependencies)
 	dh_testdir
 	dh_testroot
@@ -13,21 +25,17 @@
 ifeq ($(with_common_gcclibdir),yes)
 	ln -sf $(BASE_VERSION) \
 	    $(d_base)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lib_dir))
-	ln -sf $(BASE_VERSION) \
-	    $(d_base)/$(subst /$(BASE_VERSION),/4.4.3,$(gcc_lib_dir))
-	ln -sf $(BASE_VERSION) \
-	    $(d_base)/$(subst /$(BASE_VERSION),/4.4.4,$(gcc_lib_dir))
-	ln -sf $(BASE_VERSION) \
-	    $(d_base)/$(subst /$(BASE_VERSION),/4.4.5,$(gcc_lib_dir))
+	for link in $(additional_links); do \
+	  ln -sf $(BASE_VERSION) \
+	    $(d_base)/$$(dirname $(gcc_lib_dir))/$$link; \
+        done
   ifneq ($(gcc_lib_dir),$(gcc_lexec_dir))
 	ln -sf $(BASE_VERSION) \
 	    $(d_base)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lexec_dir))
-	ln -sf $(BASE_VERSION) \
-	    $(d_base)/$(subst /$(BASE_VERSION),/4.4.3,$(gcc_lexec_dir))
-	ln -sf $(BASE_VERSION) \
-	    $(d_base)/$(subst /$(BASE_VERSION),/4.4.4,$(gcc_lexec_dir))
-	ln -sf $(BASE_VERSION) \
-	    $(d_base)/$(subst /$(BASE_VERSION),/4.4.5,$(gcc_lexec_dir))
+	for link in $(additional_links); do \
+	  ln -sf $(BASE_VERSION) \
+	    $(d_base)/$$(dirname $(gcc_lexec_dir))/$$link; \
+        done
   endif
 endif