diff --git a/build_scripts/Ubuntu_src/debian/control b/build_scripts/Ubuntu_src/debian/control
index 38ba9adc4..c8f08a190 100644
--- a/build_scripts/Ubuntu_src/debian/control
+++ b/build_scripts/Ubuntu_src/debian/control
@@ -2,7 +2,7 @@ Source: retroshare
 Section: devel
 Priority: standard
 Maintainer: Cyril Soler <csoler@users.sourceforge.net>
-Build-Depends: debhelper (>= 7),  libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libqtmultimediakit1, qtmobility-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler, cmake, libsqlite3-dev, libcurl4-openssl-dev
+Build-Depends: debhelper (>= 7),  libglib2.0-dev, libupnp-dev, qt4-dev-tools, libqt4-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libqt4-opengl-dev, libqtmultimediakit1, qtmobility-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, libprotobuf-dev, protobuf-compiler, cmake, libcurl4-openssl-dev
 Standards-Version: 3.9.1
 Homepage: http://retroshare.sourceforge.net
 
@@ -32,6 +32,7 @@ Description: RetroShare LinksCloud plugin
 Package: retroshare-nogui
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare
 Description: Secure communication with friends
  This is the command-line client for RetroShare network. This client
  can be contacted and talked-to using SSL. Clients exist for portable
@@ -40,6 +41,7 @@ Description: Secure communication with friends
 Package: retroshare
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare-nogui
 Description: Secure communication with friends
  RetroShare is a Open Source cross-platform, private and secure decentralised 
  commmunication platform. It lets you to securely chat and share files with your 
diff --git a/build_scripts/Ubuntu_src/debian/rules b/build_scripts/Ubuntu_src/debian/rules
index 3772de5a1..93fcbddea 100755
--- a/build_scripts/Ubuntu_src/debian/rules
+++ b/build_scripts/Ubuntu_src/debian/rules
@@ -13,6 +13,7 @@ build-stamp: builddir/Makefile
 	# Add here commands to compile the package.
 	cd libssh-0.5.2 && mkdir build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make 
 	cp -r libssh-0.5.2 ..
+	cd src/rsctrl/src && make
 	cd src && qmake-qt4 CONFIG=release RetroShare.pro && make
 	touch $@
 
@@ -40,6 +41,7 @@ install: build
 	install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt                   $(CURDIR)/debian/retroshare-nogui/usr/share/RetroShare/bdboot.txt
 	install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt                   $(CURDIR)/debian/retroshare/usr/share/RetroShare/bdboot.txt
 	install -D -m 755 src/retroshare-nogui/src/retroshare-nogui        		$(CURDIR)/debian/retroshare-nogui/usr/bin/RetroShare-nogui
+	install -D -m 755 src/retroshare-nogui/src/retroshare-nogui        		$(CURDIR)/debian/retroshare/usr/bin/RetroShare-nogui
 	install -D -m 755 src/retroshare-gui/src/RetroShare                		$(CURDIR)/debian/retroshare/usr/bin/RetroShare
 
 # Add here commands to install the package into debian/your_appname
diff --git a/build_scripts/Ubuntu_src/makeSourcePackage.sh b/build_scripts/Ubuntu_src/makeSourcePackage.sh
index 030f51264..d43b00aae 100755
--- a/build_scripts/Ubuntu_src/makeSourcePackage.sh
+++ b/build_scripts/Ubuntu_src/makeSourcePackage.sh
@@ -2,13 +2,12 @@
 
 ###################### PARAMETERS ####################
 version="0.5.4"
+svnpath="svn://csoler@svn.code.sf.net/p/retroshare/code/"
+workdir=retroshare-$version
 ######################################################
 
 echo This script is going to build the debian source package for RetroShare, from the svn.
 
-svnpath="svn://csoler@svn.code.sf.net/p/retroshare/code/"
-workdir=retroshare-$version
-
 if test -d "$workdir" ;  then
 	echo Please remove the $workdir directory first.
 	exit
@@ -56,6 +55,12 @@ cd $workdir
 tar zxvf ../libssh-0.5.2.tar.gz
 cd ..
 
+# cleaning up protobof generated files
+\rm -f $workdir/src/rsctrl/src/gencc/*.pb.h
+\rm -f $workdir/src/rsctrl/src/gencc/*.pb.cpp
+\rm -f $workdir/src/retroshare-nogui/src/rpc/proto/gencc/*.pb.h
+\rm -f $workdir/src/retroshare-nogui/src/rpc/proto/gencc/*.pb.cc
+
 echo Setting version numbers...
 
 # setup version numbers