diff --git a/build_scripts/Debian+Ubuntu/changelog b/build_scripts/Debian+Ubuntu/changelog
index cbfde1047..e0da54d01 100644
--- a/build_scripts/Debian+Ubuntu/changelog
+++ b/build_scripts/Debian+Ubuntu/changelog
@@ -86,7 +86,7 @@ retroshare06 (0.6.1-1.XXXXXX~YYYYYY) YYYYYY; urgency=low
   6e8e5d0 csoler   Sun,  9 Oct 2016 18:20:00 +0200 Merge pull request #529 from cavebeat/rus_patch
   3d9fb60 Phenom   Sun,  9 Oct 2016 12:37:09 +0200 Fix Missing ID-Avatars in Create Circle Menu
 
-   -- Cyril Soler <csoler@users.sourceforge.net>  Sat, 5 Nov 2016 21:00:00 +0100
+ -- Cyril Soler <csoler@users.sourceforge.net>  Sat, 5 Nov 2016 21:00:00 +0100
 
 retroshare06 (0.6.1-1.20161008.9e1f21b9~xenial) xenial; urgency=low
 
diff --git a/build_scripts/Debian+Ubuntu/control.yakkety b/build_scripts/Debian+Ubuntu/control.yakkety
new file mode 100644
index 000000000..9b557e3b8
--- /dev/null
+++ b/build_scripts/Debian+Ubuntu/control.yakkety
@@ -0,0 +1,44 @@
+Source: retroshare06
+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: retroshare06-voip-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, 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: retroshare06-feedreader-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06
+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: retroshare06-nogui
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare06
+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: retroshare06
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare06-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 
+ 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 bd2cd2ba5..baef9cbf7 100755
--- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
+++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh
@@ -135,6 +135,8 @@ for i in ${dist}; do
         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