diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 9da7c397bd3..08029cf6bd2 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,16 +1,18 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=2.84
-revision=6
+revision=7
 build_style=gnu-configure
-configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp"
+configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp
+ $(vopt_with systemd systemd-daemon)"
 hostmakedepends="pkg-config intltool"
-makedepends="zlib-devel libressl-devel dbus-glib-devel libcurl-devel libevent-devel gtk+3-devel"
+makedepends="zlib-devel libressl-devel dbus-glib-devel libcurl-devel
+ libevent-devel gtk+3-devel $(vopt_if systemd systemd-devel)"
 short_desc="A fast, easy, and free BitTorrent client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.transmissionbt.com/"
 license="MIT, GPL-2"
-distfiles="http://download.transmissionbt.com/files/$pkgname-$version.tar.xz"
+distfiles="https://transmission.cachefly.net/${pkgname}-${version}.tar.xz"
 checksum=a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb
 
 # Create transmission system user/group
@@ -18,15 +20,9 @@ system_accounts="transmission"
 transmission_homedir="/var/lib/transmission"
 make_dirs="/var/lib/transmission 0755 transmission transmission"
 subpackages="transmission-gtk"
-replaces="runit-void<20141013_2"
 
 # Package build options
 build_options="systemd"
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --with-systemd-daemon"
-	makedepends+=" systemd-devel"
-	systemd_services="transmission-daemon.service on"
-fi
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" qt5-devel qt5-tools-devel"