diff --git a/www-apps/rutorrent/Manifest b/www-apps/rutorrent/Manifest
index e21f5cabbf21a..baab557e39b1e 100644
--- a/www-apps/rutorrent/Manifest
+++ b/www-apps/rutorrent/Manifest
@@ -1,2 +1,3 @@
 DIST plugins-3.4.tar.gz 674444 SHA256 d8e8e4b2887fb15e97c7ecdfe5c76039d55fab7dc40f27655229e96e43bb507c SHA512 85d9ada4bd07cd50fdf88f4ae1a1bc682b6e54d5600356be73481094111cc21fad6fb2acac4b854ba815f986b3859caf824bc55c5bbac68872db8920e0c5fd9f WHIRLPOOL 312a27d986142087db6269af96a148761687e0eb295a3924319abf91a75ba1cb0d24f09f73bbbbfd6afa2a02ef99f22281187a479d26e84cf8ad11074dd93de5
 DIST rutorrent-3.4.tar.gz 241253 SHA256 358c19f439ed9eb27318d5cc04f467e8b894ee2752c12946ef6f9226466f1629 SHA512 2fee5dd21e0d63fa9059c96ad3e8d09f3ce556adbfd1cb148224af998edcdb82c2fe05cb56daac0cdb8c3d50346536611d019fddb1833b06fa2ebc30cd884a0a WHIRLPOOL b9ae1160cc8bd056e2db2e9207ecefdfa2fa9b5f0ef1e597ba49d2821471385c0c1ee52470849785c3d5e2840955e22946e7a03e4f188fe212e51269f691d239
+DIST rutorrent-3.8.zip 2039554 SHA256 60e952d00c818d890e9ad23f15871cfb239d935ce39173d70ab205986200178d SHA512 2129cda84b2ce3363eef2991e353bfe785c34e6be93730dd16f488d0b468b40f26b465bddf0d5defdb56f015bffd13fa4d07f16253784a4be066a9480be7a96d WHIRLPOOL a1aaf084e489372eae90493c1f76ecbc3da833527c745708f16f6b06e87e7c7094f04036733e49aa0a33f96f5974a54fb0735dffe88aebd469e9041ce8720819
diff --git a/www-apps/rutorrent/rutorrent-3.8.ebuild b/www-apps/rutorrent/rutorrent-3.8.ebuild
new file mode 100644
index 0000000000000..cee27648bdcf7
--- /dev/null
+++ b/www-apps/rutorrent/rutorrent-3.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp eutils
+
+DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
+HOMEPAGE="https://github.com/Novik/ruTorrent"
+SRC_URI="https://github.com/Novik/ruTorrent/archive/v${PV}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+need_httpd_cgi
+
+DEPEND="
+	|| ( dev-lang/php[xml,gd] dev-lang/php[xml,gd-external] )
+"
+RDEPEND="virtual/httpd-php"
+
+S="${WORKDIR}/ruTorrent-${PV}"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	default
+	find -name '\.gitignore' -type f -exec rm -rf {} \;
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
+		"$ED${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/share
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/settings
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/torrents
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/users
+
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/rutorrent/rutorrent-9999.ebuild b/www-apps/rutorrent/rutorrent-9999.ebuild
new file mode 100644
index 0000000000000..eefd5f195af56
--- /dev/null
+++ b/www-apps/rutorrent/rutorrent-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp eutils
+
+DESCRIPTION="ruTorrent is a front-end for the popular Bittorrent client rTorrent"
+HOMEPAGE="https://github.com/Novik/ruTorrent"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Novik/ruTorrent.git"
+else
+	SRC_URI="https://bintray.com/artifact/download/novik65/generic/ruTorrent-${PV}.zip"
+	KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE=""
+
+need_httpd_cgi
+
+DEPEND="
+	|| ( dev-lang/php[xml,gd] dev-lang/php[xml,gd-external] )
+"
+RDEPEND="virtual/httpd-php"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	default
+	find -name '\.gitignore' -type f -exec rm -rf {} \;
+	if [[ ${PV} == 9999 ]]; then
+		rm -rf .git
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	chmod +x "${ED}${MY_HTDOCSDIR}"/plugins/*/*.sh \
+		"$ED${MY_HTDOCSDIR}"/php/test.sh || die "chmod failed"
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/share
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/settings
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/torrents
+	webapp_serverowned "${MY_HTDOCSDIR}"/share/users
+
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/.htaccess
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/config.php
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/access.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/conf/plugins.ini
+	webapp_configfile "${MY_HTDOCSDIR}"/share/.htaccess
+
+	webapp_src_install
+}