diff --git a/tools/build-system/launchpad/dput.conf b/tools/build-system/launchpad/dput.conf
index be2e975652ae0404475c11dde4941300c1ce3a3f..55f186486b08c5460e713497472754086c996043 100644
--- a/tools/build-system/launchpad/dput.conf
+++ b/tools/build-system/launchpad/dput.conf
@@ -19,6 +19,13 @@ incoming = ~savoirfairelinux/ubuntu/natty
 login = anonymous
 allow_unsigned_uploads = 0
 
+[sflphone-oneiric]
+fqdn = ppa.launchpad.net
+method = ftp
+incoming = ~savoirfairelinux/ubuntu/oneiric
+login = anonymous
+allow_unsigned_uploads = 0
+
 [sflphone-nightly-lucid]
 fqdn = ppa.launchpad.net
 method = ftp
@@ -39,3 +46,10 @@ method = ftp
 incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/natty
 login = anonymous
 allow_unsigned_uploads = 0
+
+[sflphone-nightly-oneiric]
+fqdn = ppa.launchpad.net
+method = ftp
+incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/oneiric
+login = anonymous
+allow_unsigned_uploads = 0
diff --git a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.oneiric b/tools/build-system/launchpad/sflphone-client-gnome/debian/control.oneiric
new file mode 100644
index 0000000000000000000000000000000000000000..299ea9e057946e372e4fc9e51dfc0f0ddcff85c1
--- /dev/null
+++ b/tools/build-system/launchpad/sflphone-client-gnome/debian/control.oneiric
@@ -0,0 +1,20 @@
+Source: sflphone-client-gnome
+Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
+Section: gnome
+Priority: optional
+Build-Depends: debhelper, libgcc1, autoconf, automake, libtool, libgtk2.0-dev, libdbus-glib-1-dev, libnotify-dev, libebook1.2-dev, check, liblog4c-dev, libgnomeui-dev, gnome-doc-utils, rarian-compat, libwebkitgtk-dev
+Standards-Version: 3.7.3
+
+Package: sflphone-client-gnome
+Priority: optional
+Architecture: any
+Depends: sflphone-common (=${source:Version}), libdbus-glib-1-2, libgtk2.0-0, libc6, libglib2.0-0, libnotify4, librsvg2-common, liblog4c3, libgnomeui-0, libwebkitgtk-1.0-0
+Replaces: sflphone
+Conflicts: sflphone
+Homepage: http://www.sflphone.org
+Description: GNOME client for SFLphone
+ Provide a GNOME client for SFLphone.
+ 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/tools/build-system/launchpad/sflphone-common/debian/control.oneiric b/tools/build-system/launchpad/sflphone-common/debian/control.oneiric
new file mode 100644
index 0000000000000000000000000000000000000000..0e1b6196a9b473a7cdb887e0bc4ee5cf04ec6a5f
--- /dev/null
+++ b/tools/build-system/launchpad/sflphone-common/debian/control.oneiric
@@ -0,0 +1,28 @@
+Source: sflphone-common
+Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
+Section: gnome
+Priority: optional
+Build-Depends: debhelper  (>= 7.0.50), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev, libzrtpcpp-dev, libssl-dev, libpcre3-dev, libyaml-dev, libcelt-dev, libdbus-c++-dev
+Standards-Version: 3.7.3
+
+Package: sflphone-common
+Priority: optional
+Architecture: any
+Depends: libsamplerate0, libexpat1 , libc6, libccgnu2-1.7-0, libgsm1, libspeex1, libdbus-1-3, libasound2, libpulse0, libccrtp1-1.8-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2, libcelt0-0, libdbus-c++-1-0
+Replaces: sflphone
+Conflicts: sflphone
+Homepage: http://www.sflphone.org
+Description: SIP and IAX2 compatible softphone - Core
+ 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.
+
+Package: sflphone-common-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends:
+    sflphone-common (= ${binary:Version}),
+    ${misc:Depends}
+Description: debugging symbols for sflphone-common
diff --git a/tools/build-system/setenv.sh b/tools/build-system/setenv.sh
index ab645c322fa0495150adf38e4949357da077c7ac..97d13f8cd1a44ea8c34f812b499301721ea1c8e6 100644
--- a/tools/build-system/setenv.sh
+++ b/tools/build-system/setenv.sh
@@ -22,6 +22,6 @@ export REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
 
 export WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
 export LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
-LAUNCHPAD_DISTRIBUTIONS=( "lucid" "maverick" "natty")
+LAUNCHPAD_DISTRIBUTIONS=( "lucid" "maverick" "natty" "oneiric")
 export LAUNCHPAD_DISTRIBUTIONS