diff --git a/debian/changelog b/debian/changelog
index 370a59f230810fc2d8b10d1051b2fd164f6f9e12..259e7efdeda4cd03807401c26f96f38129277e3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,72 @@
-sflphone (0.9.3-0ubuntu1) intrepid; urgency=low
+sflphone (0.9.3-0ubuntu2) %system%; urgency=low
+
+  [ Emmanuel Milou ]
+  * Add compilation note in README
+  * Use default ALSA plugin for capture
+  * Fix the ALSA capture problem one more time
+  * Clean up debug messages in dbus.c
+  * Add libspeexdsp dependency
+  * Remove implicit declaration compilation warnings
+  * Fix links in the website, add release note
+  * Change capture for the website front page
+  * Add alsa devel dependency in build-depends control file field
+  * Clean up, indentation, try to handle latency problems in iax/pulseaudio
+  * Remove pjsip generated files from the repo
+  * Use the previous declared curAlias function in accountwindow
+  * Fix bug in history call duration when the call fails
+  * Remove runtime warning in the GTK+ client
+  * Add librsvg2-common dependency to load SVG under KDE
+  * Refresh .gitignore
+  * Update locales files + french translation
+  * Add configuration panel for future noise reduction
+  * Add configuration panel for audio record module
+  * Daemon less verbose; accounts don't try to access STUn options anymore
+  * Fix typo in configwindow
+  * Add content in the official website
+  * use a GTK_STOCK icon for the record button
+  * Complete description text in the assistant manager
+  * Add libtool flags in client configure.ac
+  * Remove unuseful dependency (snd)
+  * Fix SIP transfer problems
+  * Remove previous version of PJSIP from the repo
+  * Upgrade PJSIP to version 1.0.1
+  * Add the new website source in the repository
+
+  [ Loïc Faure-Lacroix ]
+  * Ajout du logo gpl3
+  * Ajout des images
+  * Ajout de la section screenshot pour le site
+  * Ajout du favicon dans le header
+  * Modification des cartes
+
+  [ Alexandre Savard ]
+  * Clean up <speex/libspeexdsp>
+  * Small cleanup
+  * Save Wave fixed
+  * Fix new call button when recording
+  * libspeexdsp added
+  * Recording: default home folder at startup
+  * Minor changes to config window
+  * IAX recording fixed
+  * Set / get recording path, still need some GTK for client
+  * AudioRecord file name format
+  * Now recording in HOME folder
+
+  [ Cyrille Béraud ]
+  * Fix bug in reqaccount.c
+
+  [ Maxime Chambreuil ]
+  * Update spanish translation
+
+  [Yun Liu ]
+  * Update chinese translation 
+
+  [ Hussein Abdallah ]
+  * Update russian translation
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Sat, 14 Feb 2009 13:29:15 -0500
+
+sflphone (0.9.3-0ubuntu1) %system%; urgency=low
 
   * Remove debug
   * Join thread before leaving
@@ -11,7 +79,7 @@ sflphone (0.9.3-0ubuntu1) intrepid; urgency=low
 
  -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 06 Feb 2009 19:17:32 -0500
 
-sflphone (0.9.2-2ubuntu9) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu9) %system%; urgency=low
 
   [ Alexandre Savard ]
   * Speex audio codec preprocessing initialization
@@ -39,7 +107,7 @@ sflphone (0.9.2-2ubuntu9) intrepid; urgency=low
 
  -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 05 Feb 2009 18:27:53 -0500
 
-sflphone (0.9.2-2ubuntu8) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu8) %system%; urgency=low
 
   [ Emmanuel Milou ]
   * Update changelogs
@@ -83,7 +151,7 @@ sflphone (0.9.2-2ubuntu8) intrepid; urgency=low
 
  -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 04 Feb 2009 14:00:30 -0500
 
-sflphone (0.9.2-2ubuntu7) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu7) %system%; urgency=low
 
   [ Emmanuel Milou ]
   * Update changelog to 0.9.2-6
@@ -105,7 +173,7 @@ sflphone (0.9.2-2ubuntu7) intrepid; urgency=low
 
  -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 23 Jan 2009 17:48:13 -0500
 
-sflphone (0.9.2-2ubuntu6) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu6) %system%; urgency=low
 
   [ Emmanuel Milou ]
   * Migrate STUN configuration to the main config window
@@ -139,7 +207,7 @@ sflphone (0.9.2-2ubuntu6) intrepid; urgency=low
 
  -- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net>  Fri, 16 Jan 2009 18:19:05 -0500
 
-sflphone (0.9.2-2ubuntu5) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu5) %system%; urgency=low
 
   * Fix memory leak in the pulseaudio callback
   * Update debian package generation script
@@ -155,7 +223,7 @@ sflphone (0.9.2-2ubuntu5) intrepid; urgency=low
 
  -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 14 Jan 2009 21:17:20 -0500
 
-sflphone (0.9.2-2ubuntu4) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu4) %system%; urgency=low
 
   [ Emmanuel Milou ]
   * add german translation
@@ -165,7 +233,7 @@ sflphone (0.9.2-2ubuntu4) intrepid; urgency=low
   
  -- Yun Liu <yun.liu@savoirfairelinux.com>  Thu, 08 Jan 2009 13:08:51 -0500
 
-sflphone (0.9.2-2ubuntu3) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu3) %system%; urgency=low
 
   [ Emmanuel Milou ]
   * The main thread synchronizes the ringtone thread
@@ -177,13 +245,13 @@ sflphone (0.9.2-2ubuntu3) intrepid; urgency=low
   
  -- Yun Liu <yun.liu@savoirfairelinux.com>  Tue, 06 Jan 2009 16:18:38 -0500
 
-sflphone (0.9.2-2ubuntu2) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu2) %system%; urgency=low
   
   * Fix bug ticket #129
   
  -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 5 Jan 2009 15:54:53 -0500
 
-sflphone (0.9.2-2ubuntu1) intrepid; urgency=low
+sflphone (0.9.2-2ubuntu1) %system%; urgency=low
 
   * Migrate from eXosip library to pjsip
   * Add multiple SIP accounts support
diff --git a/debian/changelog.hardy b/debian/changelog.hardy
deleted file mode 100644
index 009a6ff89b698c4c6619f79732fc1d102a145add..0000000000000000000000000000000000000000
--- a/debian/changelog.hardy
+++ /dev/null
@@ -1,266 +0,0 @@
-sflphone (0.9.3-0ubuntu1) hardy; urgency=low
-
-  * Remove debug
-  * Join thread before leaving
-  * Fix implicit declaration in reqaccount
-  * Add REST code to build the request to server
-  * Fix GValue initialization warnings
-  * Update version number, fix implicit declaration, fix GTK markup
-    warnings
-  * Apply patch to create custom SIP account from our own server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 06 Feb 2009 19:17:32 -0500
-
-sflphone (0.9.2-2ubuntu9) hardy; urgency=low
-
-  [ Alexandre Savard ]
-  * Speex audio codec preprocessing initialization
-  * peer hung up segmentation fault solved
-  * Stop recording when transfering
-  * Terminate only one call
-  * Add isRecording() function
-  * Fix call_icon GTK client
-  * Fix SIPCallClose() function, recorded file now close properly
-  * Function terminateSIPCall added in sipvoiplink and managerimpl
-  * Fix thread destructor
-  * setRecordingOption function implement in audiorecord
-  * Record now implemented in Call class
-  * Record interface complete (on hold erase previous recording)
-  * Added recButton in client
-  * Added: record button related icons
-  * Record button added
-  * Overload AudioRecord::recData to get mic and speaker data mixed
-  * Recording now in audiortp::run() method
-  * Audio recording working in AudioRTP: receiveSessionForSpeaker
-  * Open/close a wave file when pulse audio stream start/stop
-
-  [ Emmanuel Milou ]
-  * Fix path for GTK+ icons; clean up
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 05 Feb 2009 18:27:53 -0500
-
-sflphone (0.9.2-2ubuntu8) hardy; urgency=low
-
-  [ Emmanuel Milou ]
-  * Update changelogs
-  * Fix bug in merge and in Makefile.am
-  * Terminate only one call
-  * Disable PJsip shutdown when changing STUN parameters
-  * Function terminateSIPCall added in sipvoiplink and managerimpl
-  * Add a timer to the alsa thread to not jam the CPU load
-  * Fix bug in sipvoiplink.cpp
-  * Clean shutdown of pulseaudio on quiting
-  * Fix DTMF at first start with Pulseaudio
-  * Remove zeroconf from the build system
-  * Add a library manager + exception handling
-  * Clean up in the working directory
-  * Better handling of capture XRUNs
-  * Restore mic adjust volume on ALSA layer
-  * Protect device ALSA operation if not opened
-  * Fix the switching layer bug
-  * Use dynamic_cast<> to use audiolayer-specific methods
-  * Open the audio devices only once at startup
-  * Refactoring of the ALSA part
-  * Functional plug-in manager
-  * Use a C++ thread to handle tones and DTMF in ALSA
-  * Restore IAXVoIPLink, restore Mutex
-  * Make the plugins registering against the plugin manager
-  * Migrate to 1->N relationship between voiplink and accounts
-  * API plugin for registration
-  * Use C++ thread in SIP, move everything in sipvoiplink
-  * Complete singleton pattern for the plugin manager
-  * Add -Wno-return-type compilation flag to remove warnings; Update
-    version number in configure.ac
-  * Add the dynamic loading for the plugin framework; integate unit
-  * Fix jaunty control file dependency problems
-    tests
-
-  [ Yun Liu ]
-  * Update rpm spec file
-  * modify build package script and spec file for suse
-
-  [ Alexandre Savard ]
-  * Add audiorecorder plugin and testaudiorecorder
-  * Add audio Recording class, edit global.h
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 04 Feb 2009 14:00:30 -0500
-
-sflphone (0.9.2-2ubuntu7) hardy; urgency=low
-
-  [ Emmanuel Milou ]
-  * Update changelog to 0.9.2-6
-  * Fix some dbus-glib implementation details on the client side
-  * Init history after dbus initialization
-  * Add error checking in useragent; Clean sipvoiplink
-  * Prevent crash when trying to call an empty number
-  * Set the volume of the playback stream to PA_VOLUME_NORM at startup
-  * Fix GTK+ generic value double initialization
-  * Fix jaunty control file dependency problems
-  * Fix jaunty control file dependency problems
-
-  [ Yun Liu ]
-  * Fix bug ticket # 137
-  * Tolerant to gsm library of OpenSuse 11
-
-  [ Sven Werlen ]
-  * Update german translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 23 Jan 2009 17:48:13 -0500
-
-sflphone (0.9.2-2ubuntu6) hardy; urgency=low
-
-  [ Emmanuel Milou ]
-  * Migrate STUN configuration to the main config window
-  * Update french translation
-  * Other tiny memory leaks
-  * Fix memory leak in sampleconverter.cpp
-  * Generate packages from the release branch
-  * update the build package script
-  * modify the control files with architecture=any
-  * Remove valgring uninitialized value
-  * IAX and SIP use the same global variables to set account
-    configuration ; fix broken code
-
-  [ Maxime Chambreuil ]
-  * Update spanish translation
-
-  [ Hussein Abdallah ]
-  * Update russian translation
-
-  [ Yun Liu ]
-  * Update translation files
-  * Fix the bug when user uncheck the account which fails in the
-    previous registration
-  * Add stun error status
-  * Fix bug ticket #143
-  * Script for auto-install dependencies
-  * Fix bug ticket #140
-  * Fix bug ticket 141
-  * Fix the reregister process when user change the details of an
-    account
-
- -- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net>  Fri, 16 Jan 2009 18:19:05 -0500
-
-sflphone (0.9.2-2ubuntu5) hardy; urgency=low
-
-  * Fix memory leak in the pulseaudio callback
-  * Update debian package generation script
-  * Warnings removal in GTK+ client
-  * Clean adjust volume method in alsalayer
-  * Plug the sflphone playback volume control to the pulseaudio volume
-    manager
-  * Display the date in history according to the current locale
-  * Generate the changelog according to the git commit messages
-  * Complete header in chinese translation file
-  * Use the right gpg key to sign the packages
-  * add debian jaunty jackalope support
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 14 Jan 2009 21:17:20 -0500
-
-sflphone (0.9.2-2ubuntu4) hardy; urgency=low
-
-  [ Emmanuel Milou ]
-  * add german translation
-  
-  [ Yun Liu ]
-  * Fix GUI crash in Ubuntu8.10 64bit system
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Thu, 08 Jan 2009 13:08:51 -0500
-
-sflphone (0.9.2-2ubuntu3) hardy; urgency=low
-
-  [ Emmanuel Milou ]
-  * The main thread synchronizes the ringtone thread
-  * disable custom ringtone for the ALSA layer
-  * Fix the Makefile.am in man directory, add a SEE ALSO section
-  
-  [ Yun Liu ]
-  * Fix daemon crash caused by the previous patch ( for bug ticket #129)
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Tue, 06 Jan 2009 16:18:38 -0500
-
-sflphone (0.9.2-2ubuntu2) hardy; urgency=low
-  
-  * Fix bug ticket #129
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 5 Jan 2009 15:54:53 -0500
-
-sflphone (0.9.2-2ubuntu1) hardy; urgency=low
-
-  * Migrate from eXosip library to pjsip
-  * Add multiple SIP accounts support
-  * Fix ringtones problems
-  * Add a pulseaudio support
-  * Improve audio quality with ALSA
-  * Add chinese translation
-  * Improve spanish translation
-  * Migrate to a maintained C++ DBus bindings
-  * Clean and improve the build system
-  * Add build-dependency on Perl because we need pod2man to generate manpages
-
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 26 Nov 2008 09:47:53 -0500
-
-sflphone (0.9.1) unstable; urgency=low
-  * Add a search tool in the history
-  * Migrate some gtk_entry_new to sexy_icon_entry_new
-  * Bug fix (Ticket #78): The voicemail password isn't displayed anymore in
-    the history tab
-  * Add the SIP registration expire value in the user file.
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 22 May 2008 11:14:25 -0500
-
-sflphone (0.9.0) unstable; urgency=low
-  * Add history features
-    * Call date
-    * Call duration
-    * Mouse events in the history tab
-  * Smooth switch from the history tab to the calls tab
-  * Remove most of GTK-Critical warnings
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 13 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-06-06) unstable; urgency=low
-  * Audio bug correction: capture stopped after a few minutes of conversation
-  with USB Plantronics sound card
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Tue, 06 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-05-06) unstable; urgency=low
-  * Bug correction: account creation with the assistant
-  * GTK+ warnings removal
-  * libnotify warnings removal
-  * Remove aliasing on the SFLphone logo
-  
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Mon, 05 May 2008 16:58:25 -0500
-
-sflphone (0.9) unstable; urgency=low
-  * Clean dependencies ( removal of libboost )
-  * Several GTK improvement and updates
-    -account window
-    -configuration window
-  * Migrate from GtkCheckMenuItem to GtkImageMenuItem  
-  * ALSA standard I/O transfers: MMAP instead of R/W
-  * Fix speex audio quality
-  * IAX2 protocol
-    -Fix hold/unhold situation
-    -Add on hold music
-  * SIP protocol
-    -Ringtone on incoming call
-    -Fix transfer situation
-  * Add desktop notification ( libnotify )
-  * Improve the system tray icon behaviour
-  * Improve registration error handling
-  * Register/unregister from the account window takes effect without starting back SFLphone
-  * Compilation warnings removal
-  * Call history
-  * Add an account configuration wizard
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 30 Apr 2008 16:58:25 -0500
-
-sflphone (0.8.2) unstable; urgency=low
-  * Internationalization of the GTK GUI
-  * English / French
-  * STUN support
-  * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 21 Mar 2008 11:37:53 -0500
diff --git a/debian/changelog.intrepid b/debian/changelog.intrepid
deleted file mode 100644
index 07720471d4796a869cbd99823765b5404a6e8474..0000000000000000000000000000000000000000
--- a/debian/changelog.intrepid
+++ /dev/null
@@ -1,266 +0,0 @@
-sflphone (0.9.3-0ubuntu1) intrepid; urgency=low
-
-  * Remove debug
-  * Join thread before leaving
-  * Fix implicit declaration in reqaccount
-  * Add REST code to build the request to server
-  * Fix GValue initialization warnings
-  * Update version number, fix implicit declaration, fix GTK markup
-    warnings
-  * Apply patch to create custom SIP account from our own server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 06 Feb 2009 19:17:32 -0500
-
-sflphone (0.9.2-2ubuntu9) intrepid; urgency=low
-
-  [ Alexandre Savard ]
-  * Speex audio codec preprocessing initialization
-  * peer hung up segmentation fault solved
-  * Stop recording when transfering
-  * Terminate only one call
-  * Add isRecording() function
-  * Fix call_icon GTK client
-  * Fix SIPCallClose() function, recorded file now close properly
-  * Function terminateSIPCall added in sipvoiplink and managerimpl
-  * Fix thread destructor
-  * setRecordingOption function implement in audiorecord
-  * Record now implemented in Call class
-  * Record interface complete (on hold erase previous recording)
-  * Added recButton in client
-  * Added: record button related icons
-  * Record button added
-  * Overload AudioRecord::recData to get mic and speaker data mixed
-  * Recording now in audiortp::run() method
-  * Audio recording working in AudioRTP: receiveSessionForSpeaker
-  * Open/close a wave file when pulse audio stream start/stop
-
-  [ Emmanuel Milou ]
-  * Fix path for GTK+ icons; clean up
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 05 Feb 2009 18:27:53 -0500
-
-sflphone (0.9.2-2ubuntu8) intrepid; urgency=low
-
-  [ Emmanuel Milou ]
-  * Update changelogs
-  * Fix bug in merge and in Makefile.am
-  * Terminate only one call
-  * Disable PJsip shutdown when changing STUN parameters
-  * Function terminateSIPCall added in sipvoiplink and managerimpl
-  * Add a timer to the alsa thread to not jam the CPU load
-  * Fix bug in sipvoiplink.cpp
-  * Clean shutdown of pulseaudio on quiting
-  * Fix DTMF at first start with Pulseaudio
-  * Remove zeroconf from the build system
-  * Add a library manager + exception handling
-  * Clean up in the working directory
-  * Better handling of capture XRUNs
-  * Restore mic adjust volume on ALSA layer
-  * Protect device ALSA operation if not opened
-  * Fix the switching layer bug
-  * Use dynamic_cast<> to use audiolayer-specific methods
-  * Open the audio devices only once at startup
-  * Refactoring of the ALSA part
-  * Functional plug-in manager
-  * Use a C++ thread to handle tones and DTMF in ALSA
-  * Restore IAXVoIPLink, restore Mutex
-  * Make the plugins registering against the plugin manager
-  * Migrate to 1->N relationship between voiplink and accounts
-  * API plugin for registration
-  * Use C++ thread in SIP, move everything in sipvoiplink
-  * Complete singleton pattern for the plugin manager
-  * Add -Wno-return-type compilation flag to remove warnings; Update
-    version number in configure.ac
-  * Add the dynamic loading for the plugin framework; integate unit
-  * Fix jaunty control file dependency problems
-    tests
-
-  [ Yun Liu ]
-  * Update rpm spec file
-  * modify build package script and spec file for suse
-
-  [ Alexandre Savard ]
-  * Add audiorecorder plugin and testaudiorecorder
-  * Add audio Recording class, edit global.h
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 04 Feb 2009 14:00:30 -0500
-
-sflphone (0.9.2-2ubuntu7) intrepid; urgency=low
-
-  [ Emmanuel Milou ]
-  * Update changelog to 0.9.2-6
-  * Fix some dbus-glib implementation details on the client side
-  * Init history after dbus initialization
-  * Add error checking in useragent; Clean sipvoiplink
-  * Prevent crash when trying to call an empty number
-  * Set the volume of the playback stream to PA_VOLUME_NORM at startup
-  * Fix GTK+ generic value double initialization
-  * Fix jaunty control file dependency problems
-  * Fix jaunty control file dependency problems
-
-  [ Yun Liu ]
-  * Fix bug ticket # 137
-  * Tolerant to gsm library of OpenSuse 11
-
-  [ Sven Werlen ]
-  * Update german translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 23 Jan 2009 17:48:13 -0500
-
-sflphone (0.9.2-2ubuntu6) intrepid; urgency=low
-
-  [ Emmanuel Milou ]
-  * Migrate STUN configuration to the main config window
-  * Update french translation
-  * Other tiny memory leaks
-  * Fix memory leak in sampleconverter.cpp
-  * Generate packages from the release branch
-  * update the build package script
-  * modify the control files with architecture=any
-  * Remove valgring uninitialized value
-  * IAX and SIP use the same global variables to set account
-    configuration ; fix broken code
-
-  [ Maxime Chambreuil ]
-  * Update spanish translation
-
-  [ Hussein Abdallah ]
-  * Update russian translation
-
-  [ Yun Liu ]
-  * Update translation files
-  * Fix the bug when user uncheck the account which fails in the
-    previous registration
-  * Add stun error status
-  * Fix bug ticket #143
-  * Script for auto-install dependencies
-  * Fix bug ticket #140
-  * Fix bug ticket 141
-  * Fix the reregister process when user change the details of an
-    account
-
- -- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net>  Fri, 16 Jan 2009 18:19:05 -0500
-
-sflphone (0.9.2-2ubuntu5) intrepid; urgency=low
-
-  * Fix memory leak in the pulseaudio callback
-  * Update debian package generation script
-  * Warnings removal in GTK+ client
-  * Clean adjust volume method in alsalayer
-  * Plug the sflphone playback volume control to the pulseaudio volume
-    manager
-  * Display the date in history according to the current locale
-  * Generate the changelog according to the git commit messages
-  * Complete header in chinese translation file
-  * Use the right gpg key to sign the packages
-  * add debian jaunty jackalope support
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 14 Jan 2009 21:17:20 -0500
-
-sflphone (0.9.2-2ubuntu4) intrepid; urgency=low
-
-  [ Emmanuel Milou ]
-  * add german translation
-  
-  [ Yun Liu ]
-  * Fix GUI crash in Ubuntu8.10 64bit system
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Thu, 08 Jan 2009 13:08:51 -0500
-
-sflphone (0.9.2-2ubuntu3) intrepid; urgency=low
-
-  [ Emmanuel Milou ]
-  * The main thread synchronizes the ringtone thread
-  * disable custom ringtone for the ALSA layer
-  * Fix the Makefile.am in man directory, add a SEE ALSO section
-  
-  [ Yun Liu ]
-  * Fix daemon crash caused by the previous patch ( for bug ticket #129)
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Tue, 06 Jan 2009 16:18:38 -0500
-
-sflphone (0.9.2-2ubuntu2) intrepid; urgency=low
-  
-  * Fix bug ticket #129
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 5 Jan 2009 15:54:53 -0500
-
-sflphone (0.9.2-2ubuntu1) intrepid; urgency=low
-
-  * Migrate from eXosip library to pjsip
-  * Add multiple SIP accounts support
-  * Fix ringtones problems
-  * Add a pulseaudio support
-  * Improve audio quality with ALSA
-  * Add chinese translation
-  * Improve spanish translation
-  * Migrate to a maintained C++ DBus bindings
-  * Clean and improve the build system
-  * Add build-dependency on Perl because we need pod2man to generate manpages
-
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 26 Nov 2008 09:47:53 -0500
-
-sflphone (0.9.1) unstable; urgency=low
-  * Add a search tool in the history
-  * Migrate some gtk_entry_new to sexy_icon_entry_new
-  * Bug fix (Ticket #78): The voicemail password isn't displayed anymore in
-    the history tab
-  * Add the SIP registration expire value in the user file.
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 22 May 2008 11:14:25 -0500
-
-sflphone (0.9.0) unstable; urgency=low
-  * Add history features
-    * Call date
-    * Call duration
-    * Mouse events in the history tab
-  * Smooth switch from the history tab to the calls tab
-  * Remove most of GTK-Critical warnings
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 13 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-06-06) unstable; urgency=low
-  * Audio bug correction: capture stopped after a few minutes of conversation
-  with USB Plantronics sound card
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Tue, 06 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-05-06) unstable; urgency=low
-  * Bug correction: account creation with the assistant
-  * GTK+ warnings removal
-  * libnotify warnings removal
-  * Remove aliasing on the SFLphone logo
-  
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Mon, 05 May 2008 16:58:25 -0500
-
-sflphone (0.9) unstable; urgency=low
-  * Clean dependencies ( removal of libboost )
-  * Several GTK improvement and updates
-    -account window
-    -configuration window
-  * Migrate from GtkCheckMenuItem to GtkImageMenuItem  
-  * ALSA standard I/O transfers: MMAP instead of R/W
-  * Fix speex audio quality
-  * IAX2 protocol
-    -Fix hold/unhold situation
-    -Add on hold music
-  * SIP protocol
-    -Ringtone on incoming call
-    -Fix transfer situation
-  * Add desktop notification ( libnotify )
-  * Improve the system tray icon behaviour
-  * Improve registration error handling
-  * Register/unregister from the account window takes effect without starting back SFLphone
-  * Compilation warnings removal
-  * Call history
-  * Add an account configuration wizard
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 30 Apr 2008 16:58:25 -0500
-
-sflphone (0.8.2) unstable; urgency=low
-  * Internationalization of the GTK GUI
-  * English / French
-  * STUN support
-  * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 21 Mar 2008 11:37:53 -0500
diff --git a/debian/changelog.jaunty b/debian/changelog.jaunty
deleted file mode 100644
index 2cf73d7ff811c684bb4b8e3a7fb7dd9b2ce66f01..0000000000000000000000000000000000000000
--- a/debian/changelog.jaunty
+++ /dev/null
@@ -1,266 +0,0 @@
-sflphone (0.9.3-0ubuntu1) jaunty; urgency=low
-
-  * Remove debug
-  * Join thread before leaving
-  * Fix implicit declaration in reqaccount
-  * Add REST code to build the request to server
-  * Fix GValue initialization warnings
-  * Update version number, fix implicit declaration, fix GTK markup
-    warnings
-  * Apply patch to create custom SIP account from our own server
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 06 Feb 2009 19:17:32 -0500
-
-sflphone (0.9.2-2ubuntu9) jaunty; urgency=low
-
-  [ Alexandre Savard ]
-  * Speex audio codec preprocessing initialization
-  * peer hung up segmentation fault solved
-  * Stop recording when transfering
-  * Terminate only one call
-  * Add isRecording() function
-  * Fix call_icon GTK client
-  * Fix SIPCallClose() function, recorded file now close properly
-  * Function terminateSIPCall added in sipvoiplink and managerimpl
-  * Fix thread destructor
-  * setRecordingOption function implement in audiorecord
-  * Record now implemented in Call class
-  * Record interface complete (on hold erase previous recording)
-  * Added recButton in client
-  * Added: record button related icons
-  * Record button added
-  * Overload AudioRecord::recData to get mic and speaker data mixed
-  * Recording now in audiortp::run() method
-  * Audio recording working in AudioRTP: receiveSessionForSpeaker
-  * Open/close a wave file when pulse audio stream start/stop
-
-  [ Emmanuel Milou ]
-  * Fix path for GTK+ icons; clean up
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 05 Feb 2009 18:27:53 -0500
-
-sflphone (0.9.2-2ubuntu8) jaunty; urgency=low
-
-  [ Emmanuel Milou ]
-  * Update changelogs
-  * Fix bug in merge and in Makefile.am
-  * Terminate only one call
-  * Disable PJsip shutdown when changing STUN parameters
-  * Function terminateSIPCall added in sipvoiplink and managerimpl
-  * Add a timer to the alsa thread to not jam the CPU load
-  * Fix bug in sipvoiplink.cpp
-  * Clean shutdown of pulseaudio on quiting
-  * Fix DTMF at first start with Pulseaudio
-  * Remove zeroconf from the build system
-  * Add a library manager + exception handling
-  * Clean up in the working directory
-  * Better handling of capture XRUNs
-  * Restore mic adjust volume on ALSA layer
-  * Protect device ALSA operation if not opened
-  * Fix the switching layer bug
-  * Use dynamic_cast<> to use audiolayer-specific methods
-  * Open the audio devices only once at startup
-  * Refactoring of the ALSA part
-  * Functional plug-in manager
-  * Use a C++ thread to handle tones and DTMF in ALSA
-  * Restore IAXVoIPLink, restore Mutex
-  * Make the plugins registering against the plugin manager
-  * Migrate to 1->N relationship between voiplink and accounts
-  * API plugin for registration
-  * Use C++ thread in SIP, move everything in sipvoiplink
-  * Complete singleton pattern for the plugin manager
-  * Add -Wno-return-type compilation flag to remove warnings; Update
-    version number in configure.ac
-  * Add the dynamic loading for the plugin framework; integate unit
-  * Fix jaunty control file dependency problems
-    tests
-
-  [ Yun Liu ]
-  * Update rpm spec file
-  * modify build package script and spec file for suse
-
-  [ Alexandre Savard ]
-  * Add audiorecorder plugin and testaudiorecorder
-  * Add audio Recording class, edit global.h
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 04 Feb 2009 14:00:30 -0500
-
-sflphone (0.9.2-2ubuntu7) jaunty; urgency=low
-
-  [ Emmanuel Milou ]
-  * Update changelog to 0.9.2-6
-  * Fix some dbus-glib implementation details on the client side
-  * Init history after dbus initialization
-  * Add error checking in useragent; Clean sipvoiplink
-  * Prevent crash when trying to call an empty number
-  * Set the volume of the playback stream to PA_VOLUME_NORM at startup
-  * Fix GTK+ generic value double initialization
-  * Fix jaunty control file dependency problems
-  * Fix jaunty control file dependency problems
-
-  [ Yun Liu ]
-  * Fix bug ticket # 137
-  * Tolerant to gsm library of OpenSuse 11
-
-  [ Sven Werlen ]
-  * Update german translation
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 23 Jan 2009 17:48:13 -0500
-
-sflphone (0.9.2-2ubuntu6) jaunty; urgency=low
-
-  [ Emmanuel Milou ]
-  * Migrate STUN configuration to the main config window
-  * Update french translation
-  * Other tiny memory leaks
-  * Fix memory leak in sampleconverter.cpp
-  * Generate packages from the release branch
-  * update the build package script
-  * modify the control files with architecture=any
-  * Remove valgring uninitialized value
-  * IAX and SIP use the same global variables to set account
-    configuration ; fix broken code
-
-  [ Maxime Chambreuil ]
-  * Update spanish translation
-
-  [ Hussein Abdallah ]
-  * Update russian translation
-
-  [ Yun Liu ]
-  * Update translation files
-  * Fix the bug when user uncheck the account which fails in the
-    previous registration
-  * Add stun error status
-  * Fix bug ticket #143
-  * Script for auto-install dependencies
-  * Fix bug ticket #140
-  * Fix bug ticket 141
-  * Fix the reregister process when user change the details of an
-    account
-
- -- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net>  Fri, 16 Jan 2009 18:19:05 -0500
-
-sflphone (0.9.2-2ubuntu5) jaunty; urgency=low
-
-  * Fix memory leak in the pulseaudio callback
-  * Update debian package generation script
-  * Warnings removal in GTK+ client
-  * Clean adjust volume method in alsalayer
-  * Plug the sflphone playback volume control to the pulseaudio volume
-    manager
-  * Display the date in history according to the current locale
-  * Generate the changelog according to the git commit messages
-  * Complete header in chinese translation file
-  * Use the right gpg key to sign the packages
-  * add debian jaunty jackalope support
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 14 Jan 2009 21:17:20 -0500
-
-sflphone (0.9.2-2ubuntu4) jaunty; urgency=low
-
-  [ Emmanuel Milou ]
-  * add german translation
-  
-  [ Yun Liu ]
-  * Fix GUI crash in Ubuntu8.10 64bit system
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Thu, 08 Jan 2009 13:08:51 -0500
-
-sflphone (0.9.2-2ubuntu3) jaunty; urgency=low
-
-  [ Emmanuel Milou ]
-  * The main thread synchronizes the ringtone thread
-  * disable custom ringtone for the ALSA layer
-  * Fix the Makefile.am in man directory, add a SEE ALSO section
-  
-  [ Yun Liu ]
-  * Fix daemon crash caused by the previous patch ( for bug ticket #129)
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Tue, 06 Jan 2009 16:18:38 -0500
-
-sflphone (0.9.2-2ubuntu2) jaunty; urgency=low
-  
-  * Fix bug ticket #129
-  
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 5 Jan 2009 15:54:53 -0500
-
-sflphone (0.9.2-2ubuntu1) jaunty; urgency=low
-
-  * Migrate from eXosip library to pjsip
-  * Add multiple SIP accounts support
-  * Fix ringtones problems
-  * Add a pulseaudio support
-  * Improve audio quality with ALSA
-  * Add chinese translation
-  * Improve spanish translation
-  * Migrate to a maintained C++ DBus bindings
-  * Clean and improve the build system
-  * Add build-dependency on Perl because we need pod2man to generate manpages
-
- -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 26 Nov 2008 09:47:53 -0500
-
-sflphone (0.9.1) unstable; urgency=low
-  * Add a search tool in the history
-  * Migrate some gtk_entry_new to sexy_icon_entry_new
-  * Bug fix (Ticket #78): The voicemail password isn't displayed anymore in
-    the history tab
-  * Add the SIP registration expire value in the user file.
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 22 May 2008 11:14:25 -0500
-
-sflphone (0.9.0) unstable; urgency=low
-  * Add history features
-    * Call date
-    * Call duration
-    * Mouse events in the history tab
-  * Smooth switch from the history tab to the calls tab
-  * Remove most of GTK-Critical warnings
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 13 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-06-06) unstable; urgency=low
-  * Audio bug correction: capture stopped after a few minutes of conversation
-  with USB Plantronics sound card
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Tue, 06 May 2008 16:58:25 -0500
-
-sflphone (0.9-2008-05-06) unstable; urgency=low
-  * Bug correction: account creation with the assistant
-  * GTK+ warnings removal
-  * libnotify warnings removal
-  * Remove aliasing on the SFLphone logo
-  
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Mon, 05 May 2008 16:58:25 -0500
-
-sflphone (0.9) unstable; urgency=low
-  * Clean dependencies ( removal of libboost )
-  * Several GTK improvement and updates
-    -account window
-    -configuration window
-  * Migrate from GtkCheckMenuItem to GtkImageMenuItem  
-  * ALSA standard I/O transfers: MMAP instead of R/W
-  * Fix speex audio quality
-  * IAX2 protocol
-    -Fix hold/unhold situation
-    -Add on hold music
-  * SIP protocol
-    -Ringtone on incoming call
-    -Fix transfer situation
-  * Add desktop notification ( libnotify )
-  * Improve the system tray icon behaviour
-  * Improve registration error handling
-  * Register/unregister from the account window takes effect without starting back SFLphone
-  * Compilation warnings removal
-  * Call history
-  * Add an account configuration wizard
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 30 Apr 2008 16:58:25 -0500
-
-sflphone (0.8.2) unstable; urgency=low
-  * Internationalization of the GTK GUI
-  * English / French
-  * STUN support
-  * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
-
- -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 21 Mar 2008 11:37:53 -0500
diff --git a/debian/control.hardy b/debian/control.hardy
index 5f3325d28296677b588b36e77a96a0f21e6ac1eb..c37fa1b5d6a23a5b6549f477a660e852ca51506c 100644
--- a/debian/control.hardy
+++ b/debian/control.hardy
@@ -1,5 +1,5 @@
 Source: sflphone
-Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
+Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
 Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
diff --git a/debian/control.intrepid b/debian/control.intrepid
index 20d43bdf7175e57024c749afc715c0172dcce874..749fdedd0f8b1d9893347c8e288d8651d7a3a96c 100644
--- a/debian/control.intrepid
+++ b/debian/control.intrepid
@@ -1,5 +1,5 @@
 Source: sflphone
-Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
+Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
 Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
diff --git a/debian/control.jaunty b/debian/control.jaunty
index fa0f561ccbd5cf15378ec2acc586007de622e76b..4a7bbe42e65c1570654e3c362ed8f12f6672b881 100644
--- a/debian/control.jaunty
+++ b/debian/control.jaunty
@@ -1,5 +1,5 @@
 Source: sflphone
-Maintainer: SavoirFaireLinux Inc <yun.liu@savoirfairelinux.com>
+Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
 Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev, libasound2-dev, libspeexdsp-dev
diff --git a/src/global.h b/src/global.h
index 553fe6c161aef231e75f1fa08dcfcc5da70e55c4..334c18edfe4abf704b1b3d34a776da6bbd966e0f 100644
--- a/src/global.h
+++ b/src/global.h
@@ -32,7 +32,7 @@
 #include <map>
 #include <vector>
 
-#define SFLPHONED_VERSION "0.9.3-1"		/** Version number */
+#define SFLPHONED_VERSION "0.9.3"		/** Version number */
 
 #define HOMEDIR	(getenv ("HOME"))		/** Home directory */
 
diff --git a/tools/build-package.sh b/tools/build-package.sh
index 78e8a4f97ee214ce72409d004be522cfb2de0dc2..c2d4d5f85bab8e25b70fddf6a43dcd2cb23bf365 100755
--- a/tools/build-package.sh
+++ b/tools/build-package.sh
@@ -54,12 +54,11 @@ git checkout origin/release -b release
 # Get system parameters
 arch_flag=`getconf -a|grep LONG_BIT | sed -e 's/LONG_BIT\s*//'`
 os_version=`lsb_release -d -s -c | sed -e '1d'`
-ver=0.9.2
+ver=0.9.3
 
 if [ $platform == "ubuntu" ];then
 	# Generate the changelog, according to the distribution and the git commit messages
-	cp debian/changelog.$os_version debian/changelog
-	git-dch --debian-branch=release --release
+    sed 's/%system%/'$os_version'/g' debian/changelog > debian/changelog.tmp && mv debian/changelog.tmp debian/changelog
 fi
 
 cd ..