diff --git a/sflphone-client-gnome/debian/changelog b/sflphone-client-gnome/debian/changelog
index a31cf57ab8e77b8f72b2a91fc922a3d950e7f032..722f944f5a6671e335a07af8c5ddbe44ecb0ab22 100644
--- a/sflphone-client-gnome/debian/changelog
+++ b/sflphone-client-gnome/debian/changelog
@@ -2,8 +2,14 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
 
     ** 0.9.5 rc2 **
 
+  * [#1422] Improved error message
   * [#1402] Fix pjsip build
   * [#1404] Clear GTK-Critical Bug at client startup
+  * [#1422] Added automatic VM shutdown when building on more than one
+    VM
+  * [#1422] Fixed some issues with new changelog generation script
+  * [#1422] Moved distribution update to specific file
+  * [#1422] Dropped git-dch, replace by home made implementation
   * Changes for name based dbus connection
   * Clean changelogs
   * [#1343] Gnome: Implement a callback system to handle focus on
@@ -26,6 +32,7 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
   * [#1407] Add a scenario to pick_up action
   * Test client dbus connection to a fixed owner
   * Add python dbus test suite
+  * [#1161] Modified version handling in build system
   * [#1314] Test pulse audio and audio streams connect and disconnect
   * [#1402] Add info message after configure
   * [#1402] Build the daemon with the local pjsip library (vs the
@@ -36,10 +43,12 @@ sflphone-client-gnome (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
   * [#1314] Refactoring of pulselayer to test conect/disconnect
   * Add debug messages in debus calls concerning account
   * [#1314] Add some return values to audio init functions
+  * [#1406] add liblog4c-dev in build-depends
+  * [#1409] Restore .desktop icon
   * Bug #1405: Fix strings as requested.
   * Bug #1404: Fix strings in preferences panel.
 
- -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 15 May 2009 16:57:05 -0400
+ -- SFLphone Automatic Build System <team@sflphone.org>  Tue, 19 May 2009 12:08:18 -0400
 
 sflphone-client-gnome (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
 
diff --git a/sflphone-client-gnome/debian/control.hardy b/sflphone-client-gnome/debian/control.hardy
index 83f0f4e995874fc3ae5b701075ef62d1747baae9..7cf132491b14be839829bfd90ba87104aee5300d 100644
--- a/sflphone-client-gnome/debian/control.hardy
+++ b/sflphone-client-gnome/debian/control.hardy
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Package: sflphone-client-gnome
 Priority: optional
 Architecture: any
-Depends: sflphone-common (>= 0.9.5), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>=2.22.2), liblog4c3
+Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>=2.22.2), liblog4c3
 Replaces: sflphone
 Conflicts: sflphone
 Homepage: http://www.sflphone.org
diff --git a/sflphone-client-gnome/debian/control.intrepid b/sflphone-client-gnome/debian/control.intrepid
index 214c29304ebd213dc937cf627dde9851f0305181..747bdbf429f07c0d1ff0e66922cba5f0ab0ba753 100644
--- a/sflphone-client-gnome/debian/control.intrepid
+++ b/sflphone-client-gnome/debian/control.intrepid
@@ -8,7 +8,7 @@ Standards-Version: 3.8.0
 Package: sflphone-client-gnome
 Priority: optional
 Architecture: any
-Depends: sflphone-common (>=0.9.5), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>= 2.22.2), liblog4c3
+Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0), libdbus-glib-1-2, libnotify1 (>= 0.4), libsexy2 (>= 0.1), librsvg2-common (>= 2.22.2), liblog4c3
 Replaces: sflphone
 Conflicts: sflphone
 Homepage: http://www.sflphone.org
diff --git a/sflphone-client-gnome/debian/control.jaunty b/sflphone-client-gnome/debian/control.jaunty
index f36c19b8107b61ff95010cf4db3f415783d715b9..dd6a423896dbeb104fdbfb5615a6a795cd3590f7 100644
--- a/sflphone-client-gnome/debian/control.jaunty
+++ b/sflphone-client-gnome/debian/control.jaunty
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
 Package: sflphone-client-gnome
 Priority: optional
 Architecture: any
-Depends: sflphone-common (>=0.9.5), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 (>=2.16) , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,libdbus-glib-1-2, libnotify1 (>= 0.4), librsvg2-common (>=2.22.2), liblog4c3
+Depends: sflphone-common (=VERSION), libdbus-glib-1-2 (>= 0.73), libgtk2.0-0 (>=2.16) , libc6 (>= 2.3.6-6) , libglib2.0-0 (>= 2.12.0) ,libdbus-glib-1-2, libnotify1 (>= 0.4), librsvg2-common (>=2.22.2), liblog4c3
 Replaces: sflphone
 Conflicts: sflphone
 Homepage: http://www.sflphone.org
diff --git a/sflphone-common/Makefile.am b/sflphone-common/Makefile.am
index f774bdf57cdde3095aa6082adb35b7f09a5c383c..ffd473d7d1fb1878fcc9cc46d7505db095930206 100644
--- a/sflphone-common/Makefile.am
+++ b/sflphone-common/Makefile.am
@@ -1,14 +1,21 @@
 # Makefile.am
 
+if BUILD_TEST
+TESTS_DIR=test
 unittest:
 	@(cd test; make)
 	@echo ""
 	@echo "NOTICE: Unitary tests successfully build"
 	@echo "Go in the test directory to run them"
 	@echo ""
+else
+unittest:
+	@echo "SFLphone WARNING:"
+	@echo " -- You need the cppunit devel package to compile the unitary tests."
+endif
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libs src ringtones po man test
+SUBDIRS = libs src ringtones po man $(TESTS_DIR)
 EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
 
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index f46555b486de00e632af13b36312bd5c0ec7f286..69f2bcf1ff60155866443a426b88423595a9df18 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -267,11 +267,9 @@ AC_ARG_WITH(build-libdbus-cxx,
 )
 AC_SUBST(BUILD_LIBDBUS_CXX_DIR)
 
-
-
 dnl Check for libcppunit-dev
 CPPUNIT_MIN_VERSION=1.12
-PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION})
+PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
 AC_SUBST(CPPUNIT_LIBS)
 
 # check for libgsm1 (doesn't use pkg-config)
diff --git a/sflphone-common/debian/changelog b/sflphone-common/debian/changelog
index 1117e42e80063b2cde2a6d2063105cddc6c7ff98..f71002a6ceb17dabc0dcac89d82b890036d916d6 100644
--- a/sflphone-common/debian/changelog
+++ b/sflphone-common/debian/changelog
@@ -2,8 +2,14 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
 
     ** 0.9.5 rc2 **
 
+  * [#1422] Improved error message
   * [#1402] Fix pjsip build
   * [#1404] Clear GTK-Critical Bug at client startup
+  * [#1422] Added automatic VM shutdown when building on more than one
+    VM
+  * [#1422] Fixed some issues with new changelog generation script
+  * [#1422] Moved distribution update to specific file
+  * [#1422] Dropped git-dch, replace by home made implementation
   * Changes for name based dbus connection
   * Clean changelogs
   * [#1343] Gnome: Implement a callback system to handle focus on
@@ -26,6 +32,7 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
   * [#1407] Add a scenario to pick_up action
   * Test client dbus connection to a fixed owner
   * Add python dbus test suite
+  * [#1161] Modified version handling in build system
   * [#1314] Test pulse audio and audio streams connect and disconnect
   * [#1402] Add info message after configure
   * [#1402] Build the daemon with the local pjsip library (vs the
@@ -36,10 +43,12 @@ sflphone-common (0.9.5-SYSVER~rc2) SYSTEM; urgency=low
   * [#1314] Refactoring of pulselayer to test conect/disconnect
   * Add debug messages in debus calls concerning account
   * [#1314] Add some return values to audio init functions
+  * [#1406] add liblog4c-dev in build-depends
+  * [#1409] Restore .desktop icon
   * Bug #1405: Fix strings as requested.
   * Bug #1404: Fix strings in preferences panel.
 
- -- SFLphone Automatic Build System <team@sflphone.org>  Fri, 15 May 2009 16:56:52 -0400
+ -- SFLphone Automatic Build System <team@sflphone.org>  Tue, 19 May 2009 12:08:03 -0400
 
 sflphone-common (0.9.5-0ubuntu1~rc1) SYSTEM; urgency=low
 
diff --git a/sflphone-common/debian/control.hardy b/sflphone-common/debian/control.hardy
index a8e21760384ceb2d7f09614be3772d84c6f4c942..e14674d170b6caa6f4bac6d1118e5d1a336a88f6 100644
--- a/sflphone-common/debian/control.hardy
+++ b/sflphone-common/debian/control.hardy
@@ -2,7 +2,7 @@ Source: sflphone-common
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev
+Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev, libexpat1-dev
 Standards-Version: 3.7.3
 
 Package: sflphone-common
diff --git a/sflphone-common/debian/control.intrepid b/sflphone-common/debian/control.intrepid
index 7376cb3ebc957cc3792790236073cbfb8da6e03e..270e67811229719df9e000fd3a0871e30b9c675a 100644
--- a/sflphone-common/debian/control.intrepid
+++ b/sflphone-common/debian/control.intrepid
@@ -2,7 +2,7 @@ Source: sflphone-common
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev
+Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
 Standards-Version: 3.8.0
 
 Package: sflphone-common
diff --git a/sflphone-common/debian/control.jaunty b/sflphone-common/debian/control.jaunty
index 67dc4c90701f7313966ac891f7cc84559ac278c5..f871e07e758e0ce60d07488c106de092517de54e 100644
--- a/sflphone-common/debian/control.jaunty
+++ b/sflphone-common/debian/control.jaunty
@@ -2,7 +2,7 @@ Source: sflphone-common
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev
+Build-Depends: debhelper (>= 5), 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
 Standards-Version: 3.7.3
 
 Package: sflphone-common
diff --git a/sflphone-common/po/de.po b/sflphone-common/po/de.po
index f0e8f4fd94452609c1e1c2cbc8c59b721a92c686..5a1104c6c3bb253d4433e27dd1f0b7e7ee0d05fe 100644
--- a/sflphone-common/po/de.po
+++ b/sflphone-common/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sflphone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-05 17:43-0400\n"
 "PO-Revision-Date: 2009-01-08 10:46-0500\n"
 "Last-Translator: Sven Werlen <sven.werlen@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -438,8 +438,8 @@ msgid "_Show main window"
 msgstr "_Hauptfenster anzeigen"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - %i Konten registriert"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
diff --git a/sflphone-common/po/es.po b/sflphone-common/po/es.po
index 867ee386d22d2588b897f88fc91ec32c9757a0f4..065a1d431eefe193243ae2366ce8a9c88b4035cb 100644
--- a/sflphone-common/po/es.po
+++ b/sflphone-common/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-05 17:43-0400\n"
 "PO-Revision-Date: 2008-08-11 11:53+0200\n"
 "Last-Translator: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -435,8 +435,8 @@ msgid "_Show main window"
 msgstr "Mostrar ventana principal"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - %i cuenta registrada"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
diff --git a/sflphone-common/po/ru.po b/sflphone-common/po/ru.po
index 97ddd36c6d4d4c6f82659e6acdf0d54093d5cc2b..109c66c9b80adeb83c9385990a4865295f60004c 100644
--- a/sflphone-common/po/ru.po
+++ b/sflphone-common/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-05 17:43-0400\n"
 "PO-Revision-Date: 2009-01-08 15:19 GMT-5\n"
 "Last-Translator: HUSSEIN ABDALLAH <hussein.abdallah@savoirfairelinux.com>\n"
 "Language-Team:  Savoir-Faire Linux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -432,8 +432,8 @@ msgid "_Show main window"
 msgstr "_Показать главное окно"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - Зарегистрировано %i аккаунтов"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
diff --git a/sflphone-common/po/zh_CN.po b/sflphone-common/po/zh_CN.po
index 08199ce8b25656394c0112db295af5feffb8303b..0cfb2ca145f72e76b3f53cb96672438368c3d5bb 100644
--- a/sflphone-common/po/zh_CN.po
+++ b/sflphone-common/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-05 17:43-0400\n"
 "PO-Revision-Date: 2008-10-28 14:15\n"
 "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -432,8 +432,8 @@ msgid "_Show main window"
 msgstr "显示主窗口(S)"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - %i 个帐户已注册"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46
diff --git a/sflphone-common/po/zh_HK.po b/sflphone-common/po/zh_HK.po
index 96b6be28b4014d748ba3fceb2ad5aa1096cdb7fa..fa7d301e6528165bd73e5d413cc186380675c7b5 100644
--- a/sflphone-common/po/zh_HK.po
+++ b/sflphone-common/po/zh_HK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SFLphone 0.9.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-05 17:03-0400\n"
+"POT-Creation-Date: 2009-05-05 17:43-0400\n"
 "PO-Revision-Date: 2008-10-28 14:15\n"
 "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n"
 "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n"
@@ -431,8 +431,8 @@ msgid "_Show main window"
 msgstr "顯示主窗口(S)"
 
 #: ../../sflphone-client-gnome/src/statusicon.c:124
-#, c-format
-msgid "SFLphone - %i accounts registered"
+#, fuzzy, c-format
+msgid "SFLphone - %i accounts configured"
 msgstr "SFLphone - %i 個帳戶已註冊"
 
 #: ../../sflphone-client-gnome/src/timestamp.c:46