diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
new file mode 100644
index 0000000..f45e103
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
+inherit eutils git-r3 gnome2-utils multilib qmake-utils
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="http://retroshare.sourceforge.net"
+
+# pegmarkdown can also be used with MIT
+LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="cli feedreader qt5 qt4 feedreader voip"
+REQUIRED_USE="|| ( qt4 qt5 )
+	feedreader? ( || ( qt4 qt5 ) )
+	voip? ( || ( qt4 qt5 ) )"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlcipher
+	dev-libs/openssl:0
+	gnome-base/libgnome-keyring
+	net-libs/libmicrohttpd
+	net-libs/libupnp
+	sys-libs/zlib
+	cli? (
+		dev-libs/protobuf
+		net-libs/libssh[server]
+	)
+	feedreader? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		net-misc/curl
+	)
+	qt4? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/designer:4
+	)
+	qt5? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+	)
+	voip? (
+		qt5? (
+			<media-libs/opencv-3.0.0[-qt4]
+			media-libs/speex
+			virtual/ffmpeg[encode]
+		)
+		qt4? (
+			media-libs/speex
+			dev-qt/qt-mobility[multimedia]
+			dev-qt/qtmultimedia:4
+			<media-libs/opencv-3.0.0
+		)
+	)"
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/qtcore:5 )
+	qt4? ( dev-qt/qtcore:4 )
+	virtual/pkgconfig"
+
+src_prepare() {
+	local dir
+
+	# Version info.
+	cd ${S}/libretroshare/src/
+	./version_detail.sh
+	cd ${S}/retroshare-gui/src
+	./version_detail.sh
+
+	cd ${S}
+
+	sed -i \
+		-e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \
+		libretroshare/src/rsserver/rsinit.cc \
+		|| die "sed on libretroshare/src/rsserver/rsinit.cc failed"
+
+	rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown"
+	use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
+	use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
+	use qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
+	use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
+	use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
+
+	# Force linking to sqlcipher ONLY
+	sed -i \
+		-e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \
+		retroshare-gui/src/retroshare-gui.pro \
+		retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
+
+	## Version info.
+	#${S}/libretroshare/src/version_detail.sh
+	#${S}/retroshare-gui/src/version_detail.sh
+
+	epatch_user
+}
+
+src_configure() {
+	for dir in ${rs_src_dirs} ; do
+		pushd "${S}/${dir}" 2>/dev/null || die
+		use qt5 && eqmake5
+		use qt4 && eqmake4
+		popd 2>/dev/null || die
+	done
+}
+
+src_compile() {
+	local dir
+
+	for dir in ${rs_src_dirs} ; do
+		emake -C "${dir}"
+	done
+
+	unset rs_src_dirs
+}
+
+src_install() {
+	local i
+	local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
+
+	use cli && dobin retroshare-nogui/src/RetroShare06-nogui
+	use qt5 && dobin retroshare-gui/src/RetroShare06
+	use qt4 && dobin retroshare-gui/src/RetroShare06
+
+	exeinto "${extension_dir}"
+	use feedreader && doexe plugins/FeedReader/*.so*
+	use voip && doexe plugins/VOIP/*.so*
+
+	insinto /usr/share/RetroShare06
+	doins libbitdht/src/bitdht/bdboot.txt
+
+	insinto /usr/share/RetroShare06/webui
+	doins libresapi/src/webfiles/*
+
+	dodoc README.md
+	make_desktop_entry RetroShare06
+	for i in 24 48 64 128 ; do
+		doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png"
+	done
+}
+
+pkg_preinst() {
+	if [[ "${REPLACING_VERSIONS}" = "0.5*"  ]]; then
+		elog "You are upgrading from Retroshare 0.5.* to ${PV}"
+		elog "Version 0.6.* is backward-incompatible with 0.5 branch"
+		elog "and clients with 0.6.* can not connect to clients that have 0.5.*"
+		elog "It's recommended to drop all your configuration and either"
+		elog "generate a new certificate or import existing from a backup"
+	fi
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}