diff --git a/srcpkgs/retroshare/files/retroshare.desktop b/srcpkgs/retroshare/files/retroshare.desktop
new file mode 100644
index 0000000000..39b465db85
--- /dev/null
+++ b/srcpkgs/retroshare/files/retroshare.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=RetroShare
+Comment=Securely share files with your friends
+Exec=/usr/bin/retroshare
+Icon=/usr/share/pixmaps/retroshare.png
+Terminal=false
+Type=Application
+Categories=Application;Network;
+
diff --git a/srcpkgs/retroshare/patches/retroshare06-libupnp.patch b/srcpkgs/retroshare/patches/retroshare06-libupnp.patch
new file mode 100644
index 0000000000..75f0efaec4
--- /dev/null
+++ b/srcpkgs/retroshare/patches/retroshare06-libupnp.patch
@@ -0,0 +1,12 @@
+diff -ru retroshare06-0.6.0.orig/src/libretroshare/src/libretroshare.pro retroshare06-0.6.0/src/libretroshare/src/libretroshare.pro
+--- retroshare06-0.6.0.orig/src/libretroshare/src/libretroshare.pro	2015-12-29 12:44:59.441793222 +0100
++++ retroshare06-0.6.0/src/libretroshare/src/libretroshare.pro	2015-12-29 12:45:27.413886403 +0100
+@@ -173,7 +173,7 @@
+ 		# Normal libupnp
+ 	} else {
+ 		# Patched libupnp or new unreleased version
+-		DEFINES *= PATCHED_LIBUPNP
++		# DEFINES *= PATCHED_LIBUPNP
+ 	}
+ 
+ 	DEFINES *= UBUNTU
diff --git a/srcpkgs/retroshare/patches/retroshare06-novoip.patch b/srcpkgs/retroshare/patches/retroshare06-novoip.patch
new file mode 100644
index 0000000000..2272128e05
--- /dev/null
+++ b/srcpkgs/retroshare/patches/retroshare06-novoip.patch
@@ -0,0 +1,9 @@
+diff -uNr retroshare06-0.6.0.orig/src/plugins/plugins.pro retroshare06-0.6.0/src/plugins/plugins.pro
+--- retroshare06-0.6.0.orig/src/plugins/plugins.pro	2015-12-29 15:19:39.530000000 +0100
++++ retroshare06-0.6.0/src/plugins/plugins.pro	2015-12-29 15:20:03.906000000 +0100
+@@ -1,5 +1,4 @@
+ TEMPLATE = subdirs
+ 
+ SUBDIRS += \
+-		VOIP \
+ 		FeedReader
diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
new file mode 100644
index 0000000000..891634f669
--- /dev/null
+++ b/srcpkgs/retroshare/template
@@ -0,0 +1,27 @@
+# Template file for 'retroshare'
+pkgname=retroshare
+version=0.6.0.RC2
+revision=1
+homepage="http://retroshare.sourceforge.net/"
+short_desc="A Decentralized Social Sharing Network"
+maintainer="Abel Vdo <vdo@greyfaze.net>"
+license="GPL-3"
+hostmakedepends="pkg-config qt-qmake"
+makedepends="qt-devel libressl-devel libssh-devel zlib-devel bzip2-devel sqlite-devel libupnp-devel libgnome-keyring-devel libmicrohttpd-devel sqlcipher-devel libXScrnSaver-devel libxslt-devel libcurl-devel"
+distfiles="${SOURCEFORGE_SITE}/retroshare/RetroShare/0.6.0-rc2/${pkgname}_${version}~8551_src.tgz"
+checksum="2320676da905de6c48b01eda611811965277ffa1d5ddbb387aa8f0414c2de050"
+depends="qt"
+build_style=qmake
+wrksrc="retroshare06-0.6.0"
+build_wrksrc="src"
+patch_args="-Np1"
+post_install() {
+	cd ${wrksrc}
+	vbin src/retroshare-gui/src/RetroShare retroshare
+	vbin src/retroshare-nogui/src/retroshare-nogui retroshare-nogui
+	vinstall src/plugins/FeedReader/libFeedReader.so 755 usr/lib/retroshare/extensions6/
+	vinstall src/retroshare-gui/src/gui/images/logo/logo_512.png 644 usr/share/pixmaps/ retroshare.png
+	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications/
+	vinstall src//libbitdht/src/bitdht/bdboot.txt 644 usr/share/RetroShare06/
+	vcopy src/retroshare-gui/src/qss usr/share/RetroShare06/
+}