diff --git a/build_scripts/Debian+Ubuntu/control.artful b/build_scripts/Debian+Ubuntu/control.artful
new file mode 100644
index 000000000..80b452523
--- /dev/null
+++ b/build_scripts/Debian+Ubuntu/control.artful
@@ -0,0 +1,46 @@
+Source: retroshare
+Section: devel
+Priority: standard
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Build-Depends: debhelper (>= 7),  libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default
+Standards-Version: 3.9.6
+Homepage: http://retroshare.sourceforge.net
+
+Package: retroshare-voip-plugin
+Architecture: any
+Conflicts: retroshare06-voip-plugin
+Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare, libspeex1, libspeexdsp1, libqt5multimedia5
+Description: RetroShare VOIP plugin
+ This package provides a plugin for RetroShare, a secured Friend-to-Friend communication 
+ plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
+ friends chatting together need the plugin installed to be able to talk together.
+
+Package: retroshare-feedreader-plugin
+Architecture: any
+Conflicts: retroshare06-feedreader-plugin
+Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare
+Description: RetroShare FeedReader plugin
+ This package provides a plugin for RetroShare, a secured Friend-to-Friend communication 
+ plateform. The plugin adds a RSS feed reader tab to retroshare.
+
+Package: retroshare-nogui
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare,retroshare06-nogui
+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
+ devices running e.g. Android. 
+
+Package: retroshare
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare-nogui,retroshare06
+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 
+ friends and family, using a web-of-trust to authenticate peers and OpenSSL to 
+ encrypt all communication. RetroShare provides filesharing, chat, messages, 
+ forums and channels.
+
+
diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
index e2cf2f79c..9e3bd4fff 100755
--- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
+++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
@@ -55,7 +55,7 @@ while [ ${#} -gt 0 ]; do
 done
 
 if test "${dist}" = "" ; then
-	dist="precise trusty vivid xenial zesty"
+	dist="precise trusty xenial zesty artful"
 fi
 
 echo Attempting to get revision number...
@@ -121,23 +121,11 @@ for i in ${dist}; do
     echo copying changelog for ${i}
     sed -e s/XXXXXX/"${rev}"/g -e s/YYYYYY/"${i}"/g ../changelog > debian/changelog
 
-    if test "${i}" = "lucid" ; then
-        cp ../control.ubuntu_lucid debian/control
-    elif test "${i}" = "zesty" ; then
-        cp ../control.zesty debian/control
-    elif test "${i}" = "squeeze" ; then
-        cp ../control.squeeze_bubba3 debian/control
-    elif test "${i}" = "precise" ; then
-        cp ../control.precise debian/control
-    elif test "${i}" = "xenial" ; then
-        cp ../control.xenial debian/control
-    elif test "${i}" = "yakkety" ; then
-        cp ../control.yakkety debian/control
-    elif test "${i}" = "stretch" ; then
-        cp ../control.${i} debian/control
-    elif test "${i}" = "jessie" ; then
-        cp ../control.${i} debian/control
+    if test -f ../control."${i}" ; then
+		echo \/\!\\ Using specific control file for distribution "${i}"
+        cp ../control."${i}" debian/control
     else
+		echo Using standard control file control."${i}" for distribution "${i}"
         cp ../debian/control debian/control
     fi