diff --git a/debian/control.hardy.i386 b/debian/control.hardy
similarity index 98%
rename from debian/control.hardy.i386
rename to debian/control.hardy
index e27aa52a287405eee4b7c40ae86dc13687f1f25b..f90c5d57c9b6137a9d8fe5cb308892c978091c04 100644
--- a/debian/control.hardy.i386
+++ b/debian/control.hardy
@@ -7,7 +7,7 @@ Standards-Version: 3.7.3
 
 Package: sflphone
 Priority: optional
-Architecture: i386
+Architecture: any
 Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,  libcommoncpp2-1.6-0  , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-0, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8) 
 Homepage: http://www.sflphone.org
 Description: SIP and IAX2 compatible softphone
diff --git a/debian/control.hardy.amd64 b/debian/control.hardy.amd64
deleted file mode 100644
index 6e005480a3f1339c0a4fce481da316d9aa0ac422..0000000000000000000000000000000000000000
--- a/debian/control.hardy.amd64
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: sflphone
-Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.3
-
-Package: sflphone
-Priority: optional
-Architecture: amd64
-Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,  libcommoncpp2-1.6-0  , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-0, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8) 
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/debian/control.intrepid.i386 b/debian/control.intrepid
similarity index 98%
rename from debian/control.intrepid.i386
rename to debian/control.intrepid
index 5095bba2da064af511824b5e0b18a00b3d23bbb7..45e00af203e28dd5e19ad962dc2dad4f23e9acd6 100644
--- a/debian/control.intrepid.i386
+++ b/debian/control.intrepid
@@ -7,7 +7,7 @@ Standards-Version: 3.8.0
 
 Package: sflphone
 Priority: optional
-Architecture: i386
+Architecture: any
 Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,  libcommoncpp2-1.6-0  , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-1, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8) 
 Homepage: http://www.sflphone.org
 Description: SIP and IAX2 compatible softphone
diff --git a/debian/control.intrepid.amd64 b/debian/control.intrepid.amd64
deleted file mode 100644
index eafb6792fa47b638c2906320d191d77528161560..0000000000000000000000000000000000000000
--- a/debian/control.intrepid.amd64
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: sflphone
-Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.8.0
-
-Package: sflphone
-Priority: optional
-Architecture: amd64
-Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,  libcommoncpp2-1.6-0  , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-1, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-1, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8) 
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/debian/control.jaunty.i386 b/debian/control.jaunty
similarity index 98%
rename from debian/control.jaunty.i386
rename to debian/control.jaunty
index e27aa52a287405eee4b7c40ae86dc13687f1f25b..f90c5d57c9b6137a9d8fe5cb308892c978091c04 100644
--- a/debian/control.jaunty.i386
+++ b/debian/control.jaunty
@@ -7,7 +7,7 @@ Standards-Version: 3.7.3
 
 Package: sflphone
 Priority: optional
-Architecture: i386
+Architecture: any
 Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,  libcommoncpp2-1.6-0  , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-0, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8) 
 Homepage: http://www.sflphone.org
 Description: SIP and IAX2 compatible softphone
diff --git a/debian/control.jaunty.amd64 b/debian/control.jaunty.amd64
deleted file mode 100644
index 6e005480a3f1339c0a4fce481da316d9aa0ac422..0000000000000000000000000000000000000000
--- a/debian/control.jaunty.amd64
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: sflphone
-Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
-Section: gnome
-Priority: optional
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.3
-
-Package: sflphone
-Priority: optional
-Architecture: amd64
-Depends: libgcc1 , libsamplerate0 (>=0.1.2) , libdbus-glib-1-2 (>= 0.73), libexpat1 , libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,  libcommoncpp2-1.6-0  , sflphone-iax2, libgsm1 (>=1.0.10) , libspeex1 (>=1.1.12) , libdbus-1-3, libdbus-glib-1-2, dbus-c++-1 (>=0.5.0) , libsexy2 (>=0.1.11), libcppunit-1.12-0, libasound2 (>= 1.0), libpulse0 (>= 0.9.6), libccrtp1-1.6-0, libnotify1 (>= 0.4), libsexy2 (>= 0.1), perl (>=5.5.8) 
-Homepage: http://www.sflphone.org
-Description: SIP and IAX2 compatible softphone
- SFLphone is meant to be a robust enterprise-class desktop phone.
- SFLphone is released under the GNU General Public License.
- SFLphone is being developed by the global community, and maintained by
- Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.