diff -u gcc-4.4-fsf-4.4.4/debian/rules.defs gcc-4.4-fsf-4.4.4/debian/rules.defs
--- gcc-4.4-fsf-4.4.4/debian/rules.defs
+++ gcc-4.4-fsf-4.4.4/debian/rules.defs
@@ -17,7 +17,7 @@
 distrelease	:= sid
 endif
 
-DEB_BUILD_OPTIONS := $(DEB_BUILD_OPTIONS) nocheck nolang=mudflap,fortran,c++,objc,obj-c++ nobiarch
+DEB_BUILD_OPTIONS := $(DEB_BUILD_OPTIONS) nocheck nolang=mudflap,fortran,c++,objc,obj-c++
 export DEB_BUILD_OPTIONS
 
 # creates {srcdir,builddir}_{hppa64,ia6432,spu}
@@ -1002,6 +1002,9 @@
 biarchn32archs := /mips/mipsel/
 $(foreach x,32 64 n32,$(eval $(call gen_biarch,$(x))))
 
+$(warning TARGET32_MACHINE $(TARGET32_MACHINE))
+$(warning TARGET64_MACHINE $(TARGET64_MACHINE))
+
 ifneq (,$(filter yes,$(biarch32) $(biarch64) $(biarchn32)))
   multilib := yes
 endif
diff -u gcc-4.4-fsf-4.4.4/debian/rules.parameters gcc-4.4-fsf-4.4.4/debian/rules.parameters
--- gcc-4.4-fsf-4.4.4/debian/rules.parameters
+++ gcc-4.4-fsf-4.4.4/debian/rules.parameters
@@ -2,9 +2,9 @@
 GCC_VERSION	:= 4.4.5
 NEXT_GCC_VERSION	:= 4.4.6
 BASE_VERSION	:= 4.4-fsf
-SOURCE_VERSION	:= 4.4.4-7ubuntu1
-DEB_VERSION	:= 4.4.4-7ubuntu1
-DEB_EVERSION	:= 1:4.4.4-7ubuntu1
+SOURCE_VERSION	:= 4.4.4-7ubuntu2~ppa1
+DEB_VERSION	:= 4.4.4-7ubuntu2~ppa1
+DEB_EVERSION	:= 1:4.4.4-7ubuntu2~ppa1
 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.4-7ubuntu1
+DEB_LIBGCC_VERSION	:= 1:4.4.4-7ubuntu2~ppa1
 DEB_STDCXX_SOVERSION	:= 4.4
 DEB_GCJ_SOVERSION	:= 4.4
 PKG_GCJ_EXT	:= 10
diff -u gcc-4.4-fsf-4.4.4/debian/changelog gcc-4.4-fsf-4.4.4/debian/changelog
--- gcc-4.4-fsf-4.4.4/debian/changelog
+++ gcc-4.4-fsf-4.4.4/debian/changelog
@@ -1,4 +1,4 @@
-gcc-4.4-fsf (4.4.4-7ubuntu2~ppa1) maverick; urgency=low
+gcc-4.4-fsf (4.4.4-7ubuntu2~ppa2) maverick; urgency=low
 
   * GCC 4.4 build, based on the gcc-4_4-branch (without Linaro changes).
 
diff -u gcc-4.4-fsf-4.4.4/debian/rules.d/binary-base.mk gcc-4.4-fsf-4.4.4/debian/rules.d/binary-base.mk
--- gcc-4.4-fsf-4.4.4/debian/rules.d/binary-base.mk
+++ gcc-4.4-fsf-4.4.4/debian/rules.d/binary-base.mk
@@ -11,15 +11,15 @@
 		$(gcc_lexec_dir)
 
 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.4,$(gcc_lib_dir))
+	ln -sf $(subst -fsf,,$(BASE_VERSION)) \
+	    $(d_base)/$(subst /$(subst -fsf,,$(BASE_VERSION)),/$(GCC_VERSION),$(gcc_lib_dir))
+	ln -sf $(subst -fsf,,$(BASE_VERSION)) \
+	    $(d_base)/$(subst /$(subst -fsf,,$(BASE_VERSION)),/4.4.4,$(gcc_lib_dir))
   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.4,$(gcc_lexec_dir))
+	ln -sf $(subst -fsf,,$(BASE_VERSION)) \
+	    $(d_base)/$(subst /$(subst -fsf,,$(BASE_VERSION)),/$(GCC_VERSION),$(gcc_lexec_dir))
+	ln -sf $(subst -fsf,,$(BASE_VERSION)) \
+	    $(d_base)/$(subst /$(subst -fsf,,$(BASE_VERSION)),/4.4.4,$(gcc_lexec_dir))
   endif
 endif