diff --git a/tools/build-system/launch-build-machine-2.sh b/tools/build-system/launch-build-machine-2.sh
index b6b7638195aa7152ec9585dc24cfd9caed0d023d..12f8760e79c1de83f177606a64127b320fba516a 100755
--- a/tools/build-system/launch-build-machine-2.sh
+++ b/tools/build-system/launch-build-machine-2.sh
@@ -7,16 +7,12 @@
 # Author: Julien Bonjean (julien@bonjean.info) 
 #
 # Creation Date: 2009-10-20
-# Last Modified: 2009-10-21 18:18:07 -0400
+# Last Modified: 2009-12-15 18:16:50 -0500
 #####################################################
 
 #set -x
 
-# home directory
-ROOT_DIR=${HOME}
-
-# gpg passphrase file
-GPG_FILE="${ROOT_DIR}/.gpg-sflphone"
+. `dirname $0`/setenv.sh
 
 IS_RELEASE=
 VERSION_INDEX="1"
@@ -25,14 +21,6 @@ DO_LOGGING=1
 DO_UPLOAD=1
 SNAPSHOT_TAG=`date +%Y%m%d`
 
-EDITOR=echo
-export EDITOR
-
-REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
-
-WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
-LAUNCHPAD_DIR="${WORKING_DIR}/launchpad"
-LAUNCHPAD_DISTRIBUTIONS=( "jaunty" "karmic" )
 LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
 
 echo
diff --git a/tools/build-system/make-telify-package.sh b/tools/build-system/make-telify-package.sh
new file mode 100644
index 0000000000000000000000000000000000000000..be3be86bd2f38dd67536029430396a11bf3db668
--- /dev/null
+++ b/tools/build-system/make-telify-package.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+#####################################################
+# File Name: make-telify-package.sh
+#
+# Purpose :
+#
+# Author: Julien Bonjean (julien@bonjean.info) 
+#
+# Creation Date: 2009-12-15
+# Last Modified: 2009-12-15 18:16:47 -0500
+#####################################################
+
+#set -x
+
+. `dirname $0`/setenv.sh
+
+# change to working directory
+cd ${LAUNCHPAD_DIR}
+
+if [ "$?" -ne "0" ]; then
+        echo " !! Cannot cd to launchpad directory"
+        exit -1
+fi
+
+cd ${REFERENCE_REPOSITORY}
+
+for LAUNCHPAD_DISTRIBUTION in ${LAUNCHPAD_DISTRIBUTIONS[*]}
+do
+	LOCAL_VERSION="${SOFTWARE_VERSION}~ppa${VERSION_INDEX}~${LAUNCHPAD_DISTRIBUTION}"
+
+	cp ${DEBIAN_DIR}/control.${LAUNCHPAD_DISTRIBUTION} ${DEBIAN_DIR}/control
+	cp ${DEBIAN_DIR}/changelog.generic ${DEBIAN_DIR}/changelog
+
+	sed -i "s/SYSTEM/${LAUNCHPAD_DISTRIBUTION}/g" ${DEBIAN_DIR}/changelog
+
+	cd ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}
+	./autogen.sh
+	debuild -S -sa -kFDFE4451
+	cd ${LAUNCHPAD_DIR}
+
+	if [ ${DO_UPLOAD} ] ; then
+		dput -f -c ${LAUNCHPAD_DIR}/dput.conf ${LAUNCHPAD_CONF_PREFIX}-${LAUNCHPAD_DISTRIBUTION} ${LAUNCHPAD_PACKAGE}_${LOCAL_VERSION}_source.changes
+	fi
+done
+
diff --git a/tools/build-system/setenv.sh b/tools/build-system/setenv.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ee6bbb068d40a615243101fea56e8d3735a04949
--- /dev/null
+++ b/tools/build-system/setenv.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+#####################################################
+# File Name: setenv.sh
+#
+# Purpose :
+#
+# Author: Julien Bonjean (julien@bonjean.info) 
+#
+# Creation Date: 2009-12-15
+# Last Modified: 2009-12-15 18:16:52 -0500
+#####################################################
+
+# home directory
+export ROOT_DIR=${HOME}
+
+# gpg passphrase file
+export GPG_FILE="${ROOT_DIR}/.gpg-sflphone"
+
+export EDITOR="echo"
+
+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=( "jaunty" "karmic" )
+export LAUNCHPAD_DISTRIBUTIONS
+