diff --git a/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz b/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz
index 1f3ead9a8..12765e244 100644
Binary files a/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz and b/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz differ
diff --git a/build_scripts/Ubuntu_src/changelog b/build_scripts/Ubuntu_src/changelog
new file mode 100644
index 000000000..748f069f1
--- /dev/null
+++ b/build_scripts/Ubuntu_src/changelog
@@ -0,0 +1,5 @@
+retroshare (0.5.1-0.XXXXXX~YYYYYY) YYYYYY; urgency=low
+
+  * Initial snapshot
+
+ -- Cyril Soler <csoler@sourceforge.net> <csoler@sourceforge.net>  Sat, 06 Feb 2010 07:15:46 +0100
diff --git a/build_scripts/Ubuntu_src/clean.sh b/build_scripts/Ubuntu_src/clean.sh
index 2cf4bd4b6..42cddb6c2 100755
--- a/build_scripts/Ubuntu_src/clean.sh
+++ b/build_scripts/Ubuntu_src/clean.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-rm ./retroshare_0.5-1.diff.gz
-rm ./retroshare_0.5-1_source.build
-rm ./retroshare_0.5.orig.tar.gz
-rm ./retroshare_0.5-1_source.changes 
-rm ./retroshare_0.5-1.dsc 
+rm ./retroshare_0.5.1-0.*_source.build
+rm ./retroshare_0.5.1-0.*_source.changes 
+rm ./retroshare_0.5.1.orig.tar.gz
+rm ./retroshare_0.5.1-0.*.diff.gz
+rm ./retroshare_0.5.1-0.*.dsc 
 
 rm *~
 find . -name "*~" -exec rm {} \;
diff --git a/build_scripts/Ubuntu_src/makeSourcePackage.sh b/build_scripts/Ubuntu_src/makeSourcePackage.sh
index 4ee64cc3c..e45d3589f 100755
--- a/build_scripts/Ubuntu_src/makeSourcePackage.sh
+++ b/build_scripts/Ubuntu_src/makeSourcePackage.sh
@@ -13,11 +13,19 @@ svn update
 version="0.5.1"
 ######################################################
 
-echo attempting to get svn revision number...
-svn=`svn info | grep 'Revision:' | cut -d\  -f2`
+if test "$1" = "" ; then
+	echo attempting to get svn revision number...
+	svn=`svn info | grep 'Revision:' | cut -d\  -f2`
+else
+	echo svn number has been provided. Forcing update.
+	svn="$1"
+fi
+
 echo done.
 version="$version"."$svn"
-echo got version number $version. Hit ENTER is this is this correct. Otherwise hit Ctrl+C 
+echo got version number $version. 
+echo Please check that the changelog is up to date. 
+echo Hit ENTER is this is this correct. Otherwise hit Ctrl+C 
 read tmp
 
 packages="."
@@ -30,22 +38,22 @@ tar zxvf $packages/BaseRetroShareDirs.tgz 2> /dev/null
 
 echo Checking out latest snapshot in libbitdht...
 cd retroshare-0.5/src/libbitdht/
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libbitdht/src . 2> /dev/null
+svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libbitdht/src . 2> /dev/null
 cd ../../..
 #  
 echo Checking out latest snapshot in libretroshare...
 cd retroshare-0.5/src/libretroshare/
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libretroshare/src . 2> /dev/null
+svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libretroshare/src . 2> /dev/null
 cd ../../..
 #  
 echo Checking out latest snapshot in retroshare-gui...
 cd retroshare-0.5/src/retroshare-gui/
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-gui/src . 2> /dev/null
+svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-gui/src . 2> /dev/null
 cd ../../..
 #
 echo Checking out latest snapshot in retroshare-nogui...
 cd retroshare-0.5/src/retroshare-nogui/
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-nogui/src . 2> /dev/null
+svn co -r$svn https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-nogui/src . 2> /dev/null
 cd ../../..
 
 echo Copying bdboot.txt file at installation place
@@ -83,9 +91,9 @@ cp /tmp/toto752992 retroshare-0.5/src/libbitdht/libbitdht.pro
 
 #cat retroshare-gui-ext.pro >> retroshare-0.5/src/retroshare-gui/retroshare-gui.pro 
 
-echo Building orig directory...
-mkdir retroshare-0.5.orig
-cp -r retroshare-0.5/src retroshare-0.5.orig
+#echo Building orig directory...
+#mkdir retroshare-0.5.orig
+#cp -r retroshare-0.5/src retroshare-0.5.orig
 
 # Call debuild to make the source debian package
 
@@ -95,6 +103,12 @@ mv -f retroshare-0.5/debian/control.tmp retroshare-0.5/debian/control
 
 cd retroshare-0.5
 
-# This is the key for "Cyril Soler <csoler@sourceforge.net>"
-debuild -S -kC737CA98
+for i in lucid karmic jaunty maverick ; do
+	echo copying changelog for $i
+	cat ../changelog | sed -e s/XXXXXX/"$svn"/g | sed -e s/YYYYYY/"$i"/g > debian/changelog
+
+	# This is the key for "Cyril Soler <csoler@sourceforge.net>"
+	debuild -S -kC737CA98
+done
+