diff -u gcj-4.7-4.7.3/debian/rules.conf gcj-4.7-4.7.3/debian/rules.conf
--- gcj-4.7-4.7.3/debian/rules.conf
+++ gcj-4.7-4.7.3/debian/rules.conf
@@ -312,7 +312,7 @@
 endif
 
 ifneq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick natty))
-  GMP_BUILD_DEP = libgmp3-dev | libgmp-dev (>= 2:5.0.1~),
+  GMP_BUILD_DEP = libgmp-dev (>= 2:5.0.1~),
   MPFR_BUILD_DEP = libmpfr-dev,
 else
   GMP_BUILD_DEP = libgmp-dev (>= 2:5.0.1~),
diff -u gcj-4.7-4.7.3/debian/control gcj-4.7-4.7.3/debian/control
--- gcj-4.7-4.7.3/debian/control
+++ gcj-4.7-4.7.3/debian/control
@@ -14,7 +14,7 @@
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext,
   texinfo (>= 4.3), locales, sharutils,
   procps,  libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [!arm64 !knetbsd-i386 !knetbsd-alpha !hurd-i386 !hurd-alpha !kfreebsd-i386 !kfreebsd-amd64 !knetbsd-i386 !knetbsd-alpha], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, g++-4.7 [armel armhf], gcc-4.7-source (>= 4.7.3), gcc-4.7-source (<< 4.7.4),    
-  libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev, libgmp3-dev | libgmp-dev (>= 2:5.0.1~),
+  libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev, libgmp-dev (>= 2:5.0.1~),
   dejagnu [!m68k !hurd-i386 !hurd-alpha], realpath (>= 1.9.12), chrpath, lsb-release, quilt
 Build-Depends-Indep:  
 Build-Conflicts: binutils-gold
diff -u gcj-4.7-4.7.3/debian/rules.parameters gcj-4.7-4.7.3/debian/rules.parameters
--- gcj-4.7-4.7.3/debian/rules.parameters
+++ gcj-4.7-4.7.3/debian/rules.parameters
@@ -2,15 +2,15 @@
 GCC_VERSION	:= 4.7.3
 NEXT_GCC_VERSION	:= 4.7.4
 BASE_VERSION	:= 4.7
-SOURCE_VERSION	:= 4.7.3-1ubuntu1
-DEB_VERSION	:= 4.7.3-1ubuntu1
-DEB_EVERSION	:= 1:4.7.3-1ubuntu1
+SOURCE_VERSION	:= 4.7.3-1ubuntu1~10.04
+DEB_VERSION	:= 4.7.3-1ubuntu1~10.04
+DEB_EVERSION	:= 1:4.7.3-1ubuntu1~10.04
 GDC_BASE_VERSION  := 
 DEB_GDC_VERSION	:= 
 DEB_SOVERSION	:= 4.7
 DEB_SOEVERSION	:= 1:4.7
 DEB_LIBGCC_SOVERSION	:= 
-DEB_LIBGCC_VERSION	:= 1:4.7.3-1ubuntu1
+DEB_LIBGCC_VERSION	:= 1:4.7.3-1ubuntu1~10.04
 DEB_STDCXX_SOVERSION	:= 4.7
 DEB_GCJ_SOVERSION	:= 4.7
 PKG_GCJ_EXT	:= 13
diff -u gcj-4.7-4.7.3/debian/changelog gcj-4.7-4.7.3/debian/changelog
--- gcj-4.7-4.7.3/debian/changelog
+++ gcj-4.7-4.7.3/debian/changelog
@@ -1,4 +1,4 @@
-gcj-4.7 (4.7.3-1ubuntu1~10.04) lucid; urgency=medium
+gcj-4.7 (4.7.3-1ubuntu1~10.04.1) lucid; urgency=medium
 
   * PPA upload for lucid.