diff --git a/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec b/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
index 353aa40f1ca12599535b12a1f1d6d631fd3e6b49..fb908810a2b5388e9f59d96fe449e803703e72be 100644
--- a/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
+++ b/tools/build-system/distributions/opensuse/sflphone-client-gnome.spec
@@ -9,24 +9,42 @@
 # Last Modified: 2009-05-27 17:23:32 -0400
 #####################################################
 
-%define name sflphone-client-gnome
-%define version VERSION
-%define release 1suse
-
-Name:           %name
+Name:           sflphone-client-gnome
 License:        GNU General Public License (GPL)
-Group:          System Environment/Daemons
-Summary:        A VoIP daemon with SIP protocol and IAX protocol
-Version:        %version
-Release:        %release
+Group:          Productivity/Networking/System
+Summary:        GNOME client for SFLphone
+Version:        VERSION
+Release:        opensuse
 URL:            http://www.sflphone.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Vendor:		Savoir-faire Linux
+Packager:       Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}
 Source0:        sflphone-client-gnome.tar.gz
-Requires:	commoncpp2 libccrtp1 libsamplerate pulseaudio libgsm1 libspeex  dbus-1-glib expat gtk2 glibc glib2 dbus-1 libsexy libnotify perl
-Prefix: %{_prefix}
+BuildRequires:	liblog4c-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	dbus-1-glib-devel
+BuildRequires:	libnotify-devel
+BuildRequires:	libsexy-devel
+BuildRequires:	evolution-data-server-devel
+Requires:	sflphone-common = %{version}
+Requires:	dbus-1-glib
+Requires:	gtk2
+Requires:	glib2
+Requires:	dbus-1-glib
+Requires:	libnotify
+Requires:	librsvg
+Requires:	liblog4c3
+Requires:	libsexy
+Conflicts:	sflphone
+Prefix:		%{_prefix}
 
 %description
-SFLphoned is a VoIP client with SIP protocol and IAX protocol.
+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.
 
 Authors:
 --------
diff --git a/tools/build-system/distributions/opensuse/sflphone-common.spec b/tools/build-system/distributions/opensuse/sflphone-common.spec
index bda1eab2a127b5140a696440e431cf6435e2b71c..d0a9d28601f0153906af7199800c3e1e1f6417c2 100644
--- a/tools/build-system/distributions/opensuse/sflphone-common.spec
+++ b/tools/build-system/distributions/opensuse/sflphone-common.spec
@@ -9,24 +9,45 @@
 # Last Modified: 2009-05-27 17:23:32 -0400
 #####################################################
 
-%define name sflphone-common
-%define version VERSION
-%define release 1suse
-
-Name:           %name
+Name:           sflphone-common
 License:        GNU General Public License (GPL)
 Group:          System Environment/Daemons
-Summary:        A VoIP daemon with SIP protocol and IAX protocol
-Version:        %version
-Release:        %release
+Summary:        SIP and IAX2 compatible softphone - Core
+Version:        VERSION
+Release:        opensuse
 URL:            http://www.sflphone.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Vendor:         Savoir-faire Linux
+Packager:	Julien Bonjean <julien.bonjean@savoirfairelinux.com>
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}
 Source0:        sflphone-common.tar.gz
-Requires:	commoncpp2 libccrtp1 libsamplerate pulseaudio libgsm1 libspeex  dbus-1-glib expat gtk2 glibc glib2 dbus-1 libsexy libnotify perl
-Prefix: %{_prefix}
+BuildRequires:	libpulse-devel
+BuildRequires:	commoncpp2-devel
+BuildRequires:	libccrtp-devel
+BuildRequires:	libsamplerate-devel
+BuildRequires:	dbus-1-devel
+BuildRequires:	libexpat-devel
+BuildRequires:	libgsm-devel
+BuildRequires:	speex-devel
+BuildRequires:	libcppunit-devel
+BuildRequires:	alsa-devel
+Requires:	libsamplerate
+Requires:	libexpat1
+Requires:	commoncpp2
+Requires:	libgsm1
+Requires:	libspeex
+Requires:	dbus-1
+Requires:	libasound2
+Requires:	libpulse0
+Requires:	libccrtp1
+Conflicts:      sflphone
+Prefix:		%{_prefix}
 
 %description
-SFLphoned is a VoIP daemon with SIP protocol and IAX protocol.
+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.
 
 Authors:
 --------
diff --git a/tools/build-system/launch-build-machine.sh b/tools/build-system/launch-build-machine.sh
index 522981591b521b5bd4e67d6b7a03ec2cffe4be97..122f8740d4887933f17949989b594f76cf186d3b 100755
--- a/tools/build-system/launch-build-machine.sh
+++ b/tools/build-system/launch-build-machine.sh
@@ -7,16 +7,12 @@
 # Author: Julien Bonjean (julien@bonjean.info) 
 #
 # Creation Date: 2009-04-20
-# Last Modified: 2009-05-27 17:28:36 -0400
+# Last Modified: 2009-05-28 10:13:41 -0400
 #####################################################
 
 #
 # Not working with git 1.5.4.3
 #
-#
-#
-#
-
 
 TAG=`date +%Y-%m-%d`
 
@@ -226,28 +222,28 @@ if [ ${DO_PREPARE} ]; then
 		exit -1
 	fi
 
-	FULL_VER=`cd ${REPOSITORY_DIR} && git describe --tag HEAD  | cut -d "/" -f2 | cut -d "-" -f1-2 | sed 's/\.rc.*//' | sed 's/\.beta.*//'`
+	VERSION=`cd ${REPOSITORY_DIR} && git describe --tag HEAD  | cut -d "/" -f2 | cut -d "-" -f1`
 	
 	# if push is activated
 	if [ ${DO_PUSH} ];then
 
 		# first changelog generation for commit
-		echo "Update changelogs (1/2)"
+		echo "Update debian changelogs (1/2)"
 
 		${SCRIPTS_DIR}/sfl-git-dch.sh ${RELEASE_MODE}
 	
 		if [ "$?" -ne "0" ]; then
-			echo "!! Cannot update changelogs"
+			echo "!! Cannot update debian changelogs"
 			exit -1
 		fi
 
 		echo " Doing commit"
-		VERSION_COMMIT=${FULL_VER}${VERSION_APPEND}
+		VERSION_COMMIT=${VERSION}${VERSION_APPEND}
 		if [ ! ${RELEASE_MODE} ]; then
-			VERSION_COMMIT=${FULL_VER}" Snapshot ${TAG}"
+			VERSION_COMMIT="snapshot"
 		fi
         	cd ${REPOSITORY_DIR}
-		git commit -m "[#1262] Updated changelogs for version ${VERSION_COMMIT}" . >/dev/null
+		git commit -m "[#1262] Updated debian changelogs (${VERSION_COMMIT})" . >/dev/null
 
 		echo " Pushing commit"
 		git push origin master >/dev/null
@@ -262,15 +258,19 @@ if [ ${DO_PREPARE} ]; then
         fi
 
 	# generate the changelog, according to the distribution and the git commit messages
-	echo "Update changelogs (2/2)"
+	echo "Update debian changelogs (2/2)"
 	cd ${REPOSITORY_DIR}
 	${SCRIPTS_DIR}/sfl-git-dch.sh ${RELEASE_MODE}
 	
 	if [ "$?" -ne "0" ]; then
-		echo "!! Cannot update changelogs"
+		echo "!! Cannot update debian changelogs"
 		exit -1
 	fi
 
+	echo "Write version numbers for following processes"
+	echo "${VERSION}${VERSION_APPEND}" > ${REPOSITORY_DIR}/VERSION.opensuse
+	echo "${VERSION}-0ubuntu1${VERSION_APPEND}" > ${REPOSITORY_DIR}/VERSION.ubuntu
+
 	echo "Archiving repository"
 	tar czf ${REPOSITORY_ARCHIVE} --exclude .git -C `dirname ${REPOSITORY_DIR}` sflphone