diff --git a/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz b/build_scripts/Ubuntu_src/BaseRetroShareDirs.tgz
index 875deb8d4..03ed3faca 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/README.txt b/build_scripts/Ubuntu_src/README.txt
new file mode 100644
index 000000000..3b35c5836
--- /dev/null
+++ b/build_scripts/Ubuntu_src/README.txt
@@ -0,0 +1,6 @@
+This directory contains the material for buildign a debian/ubuntu source package from 
+the svn repository of RetroShare. The various files here are:
+
+  makeSourcePackage.sh : main script. Produces a .dsc file
+  build.sh             : compiles the source package. Produce a binary pkg for a given ubuntu distribution 
+  make_tgz.sh          : rebuilds the basic directory structure if some config/debian files where modified 
diff --git a/build_scripts/Ubuntu_src/clean.sh b/build_scripts/Ubuntu_src/clean.sh
new file mode 100755
index 000000000..2cf4bd4b6
--- /dev/null
+++ b/build_scripts/Ubuntu_src/clean.sh
@@ -0,0 +1,11 @@
+#!/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 *~
+find . -name "*~" -exec rm {} \;
+
diff --git a/build_scripts/Ubuntu_src/cleanProFile.sh b/build_scripts/Ubuntu_src/cleanProFile.sh
new file mode 100755
index 000000000..e6e03a907
--- /dev/null
+++ b/build_scripts/Ubuntu_src/cleanProFile.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+tmpfile=/tmp/toto42314321
+
+cat "$1" | grep -v "CONFIG += version_detail_bash_script" > $tmpfile
+echo "INCLUDEPATH += ../libretroshare" > $1
+cat $tmpfile >> $1
+
diff --git a/build_scripts/Ubuntu_src/makeSourcePackage.sh b/build_scripts/Ubuntu_src/makeSourcePackage.sh
index 0a21fa531..43d9d1bd0 100755
--- a/build_scripts/Ubuntu_src/makeSourcePackage.sh
+++ b/build_scripts/Ubuntu_src/makeSourcePackage.sh
@@ -9,14 +9,35 @@ packages="."
 
 tar zxvf $packages/BaseRetroShareDirs.tgz
 
+# Ultimately, use the following, but 
 cd retroshare-0.5/src/libretroshare/
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libretroshare/src .
+tar zxvf ../../../libretroshare.tgz
+#  svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/libretroshare/src .
+cd ../../..
+#  
+cd retroshare-0.5/src/retroshare-gui/
+#  svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-gui/src . 
+tar zxvf ../../../retroshare-gui.tgz
 cd ../../..
 
-cd retroshare-0.5/src/retroshare-gui/
-svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/trunk/retroshare-gui/src . 
-cd ../../..
+# Various cleaning
+
+find retroshare-0.5 -name ".svn" -exec rm -rf {} \;		# remove all svn repositories
+
+mv retroshare-0.5/src/retroshare-gui/RetroShare.pro retroshare-0.5/src/retroshare-gui/retroshare-gui.pro
+
+./cleanProFile.sh retroshare-0.5/src/libretroshare/libretroshare.pro
+./cleanProFile.sh retroshare-0.5/src/retroshare-gui/retroshare-gui.pro
+
+echo "DESTDIR = ../../libretroshare/src/lib/" > /tmp/toto75299
+cat retroshare-0.5/src/libretroshare/libretroshare.pro /tmp/toto75299 > /tmp/toto752992
+cp /tmp/toto752992 retroshare-0.5/src/libretroshare/libretroshare.pro
+
+mkdir retroshare-0.5.orig
+cp -r retroshare-0.5/src retroshare-0.5.orig
+
+# Call debuild to make the source debian package
 
 cd retroshare-0.5
-debuild -S
+debuild -S -kC737CA98