diff --git a/tools/build-system/launchpad/dput.conf b/tools/build-system/launchpad/dput.conf
index 9c3bc55336a0f79008106762a1f857f25bafd5ef..11e42d88657a35b681b4f853f34892fe848a924e 100644
--- a/tools/build-system/launchpad/dput.conf
+++ b/tools/build-system/launchpad/dput.conf
@@ -19,6 +19,13 @@ incoming = ~savoirfairelinux/ubuntu/lucid
 login = anonymous
 allow_unsigned_uploads = 0
 
+[sflphone-maverick]
+fqdn = ppa.launchpad.net
+method = ftp
+incoming = ~savoirfairelinux/ubuntu/maverick
+login = anonymous
+allow_unsigned_uploads = 0
+
 [sflphone-nightly-jaunty]
 fqdn = ppa.launchpad.net
 method = ftp
@@ -40,3 +47,9 @@ incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/lucid
 login = anonymous
 allow_unsigned_uploads = 0
 
+[sflphone-nightly-maverick]
+fqdn = ppa.launchpad.net
+method = ftp
+incoming = ~savoirfairelinux/sflphone-nightly/ubuntu/maverick
+login = anonymous
+allow_unsigned_uploads = 0
diff --git a/tools/build-system/launchpad/sflphone-client-gnome/debian/control.maverick b/tools/build-system/launchpad/sflphone-client-gnome/debian/control.maverick
new file mode 100644
index 0000000000000000000000000000000000000000..53b4e025bbfa95a8a182b9feb2a54e2ba055cab6
--- /dev/null
+++ b/tools/build-system/launchpad/sflphone-client-gnome/debian/control.maverick
@@ -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, libwebkit-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, libdbus-glib-1-2, libnotify1, librsvg2-common, liblog4c3, libebook1.2-9, libgnomeui-0, libwebkit-1.0-2
+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.maverick b/tools/build-system/launchpad/sflphone-common/debian/control.maverick
new file mode 100644
index 0000000000000000000000000000000000000000..9b1561ed747d9add075108e2345cfbc87df06df3
--- /dev/null
+++ b/tools/build-system/launchpad/sflphone-common/debian/control.maverick
@@ -0,0 +1,19 @@
+Source: sflphone-common
+Maintainer: SavoirFaireLinux Inc <julien.bonjean@savoirfairelinux.com>
+Section: gnome
+Priority: optional
+Build-Depends: debhelper, 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
+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.7-0, libspeexdsp1, libzrtpcpp-1.4-0, libssl0.9.8, libpcre3, libyaml-0-2
+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.
diff --git a/tools/build-system/setenv.sh b/tools/build-system/setenv.sh
index 41bda4f473b4f635c7cb52a803fa5b57f552c584..fc90886e4bd937c1d509b7073416284698b61cd8 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=( "karmic" "lucid" )
+LAUNCHPAD_DISTRIBUTIONS=( "karmic" "lucid" "maverick" )
 export LAUNCHPAD_DISTRIBUTIONS