diff --git a/srcpkgs/subversion-ruby b/srcpkgs/subversion-ruby
deleted file mode 120000
index 4f007e127ca..00000000000
--- a/srcpkgs/subversion-ruby
+++ /dev/null
@@ -1 +0,0 @@
-subversion
\ No newline at end of file
diff --git a/srcpkgs/subversion/files/svnserve.service b/srcpkgs/subversion/files/svnserve.service
new file mode 100644
index 00000000000..d8a8e10c11a
--- /dev/null
+++ b/srcpkgs/subversion/files/svnserve.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Subversion protocol daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+EnvironmentFile=/etc/conf.d/svnserve
+ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/subversion/files/svnserve.tmpfiles b/srcpkgs/subversion/files/svnserve.tmpfiles
new file mode 100644
index 00000000000..e8487d3737a
--- /dev/null
+++ b/srcpkgs/subversion/files/svnserve.tmpfiles
@@ -0,0 +1 @@
+D /run/svnserve 0700 root root -
diff --git a/srcpkgs/subversion/libsvn.template b/srcpkgs/subversion/libsvn.template
index fae267a7c54..0be713a2978 100644
--- a/srcpkgs/subversion/libsvn.template
+++ b/srcpkgs/subversion/libsvn.template
@@ -1,9 +1,6 @@
 # Template file for 'libsvn'.
 #
 short_desc="${short_desc} - shared libraries"
-long_desc="${long_desc}
-
- This package contains the shared libraries used by subversion."
 
 do_install() {
 	vmove usr/lib usr
diff --git a/srcpkgs/subversion/subversion-apache.template b/srcpkgs/subversion/subversion-apache.template
index 6751d2597dd..744f434c294 100644
--- a/srcpkgs/subversion/subversion-apache.template
+++ b/srcpkgs/subversion/subversion-apache.template
@@ -1,10 +1,6 @@
 # Template file for 'subversion-apache'.
 #
 short_desc="${short_desc} - apache httpd modules"
-long_desc="${long_desc}
-
- This package contains two modules for the HTTP apache daemon for use
- with subversion."
 
 do_install() {
 	vmove usr/libexec usr
diff --git a/srcpkgs/subversion/subversion-devel.template b/srcpkgs/subversion/subversion-devel.template
index 2a74983feb8..e76323baccc 100644
--- a/srcpkgs/subversion/subversion-devel.template
+++ b/srcpkgs/subversion/subversion-devel.template
@@ -1,12 +1,9 @@
 # Template file for 'subversion-devel'.
 #
+noarch=yes
 depends="libsvn>=$version"
 short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
 
 do_install() {
 	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/subversion/subversion-gnome-keyring-auth.template b/srcpkgs/subversion/subversion-gnome-keyring-auth.template
index 79b6e89259c..6d8a9ca3ac6 100644
--- a/srcpkgs/subversion/subversion-gnome-keyring-auth.template
+++ b/srcpkgs/subversion/subversion-gnome-keyring-auth.template
@@ -1,10 +1,6 @@
 # Template file for 'subversion-gnome-keyring-auth'.
 #
 short_desc="subversion - gnome-keyring authentication support"
-long_desc="${long_desc}
-
- This package contains files for subversion to authenticate with
- the libgnome-keyring package."
 
 do_install() {
 	vmove "usr/lib/lib*gnome_keyring*.so*" usr/lib
diff --git a/srcpkgs/subversion/subversion-perl.template b/srcpkgs/subversion/subversion-perl.template
index 411ae1120c9..0f1c580ee5a 100644
--- a/srcpkgs/subversion/subversion-perl.template
+++ b/srcpkgs/subversion/subversion-perl.template
@@ -2,9 +2,6 @@
 #
 depends="perl>=5.16"
 short_desc="${short_desc} - perl bindings"
-long_desc="${long_desc}
-
- This package contains the perl language bindings for subversion."
 
 do_install() {
 	vmove "usr/lib/libsvn_swig_perl-1.so*" usr/lib
diff --git a/srcpkgs/subversion/subversion-python.template b/srcpkgs/subversion/subversion-python.template
index 0daa5b52876..a5df4144b2b 100644
--- a/srcpkgs/subversion/subversion-python.template
+++ b/srcpkgs/subversion/subversion-python.template
@@ -3,9 +3,6 @@
 depends="python"
 pycompile_module="libsvn svn"
 short_desc="${short_desc} - python bindings"
-long_desc="${long_desc}
-
- This package contains the Python language bindings for subversion."
 
 do_install() {
 	vmove "usr/lib/libsvn_swig_py-1.so*" usr/lib
diff --git a/srcpkgs/subversion/subversion-ruby.template b/srcpkgs/subversion/subversion-ruby.template
deleted file mode 100644
index d82a2b5f22c..00000000000
--- a/srcpkgs/subversion/subversion-ruby.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'subversion-ruby'.
-#
-short_desc="${short_desc} - ruby bindings"
-long_desc="${long_desc}
-
- This package contains the ruby language bindings for subversion."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libsvn_swig_ruby-1.so* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/ruby ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 052447a1688..3317c31d812 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -1,25 +1,26 @@
 # Template file for 'subversion'
 pkgname=subversion
-version=1.7.5
+version=1.7.8
 revision=1
-homepage="http://subversion.apache.org/"
-subpackages="$pkgname-python $pkgname-perl $pkgname-gnome-keyring-auth $pkgname-devel libsvn"
-# XXX enable kwallet when kdelibs is available.
-makedepends="pkg-config perl>=5.16 python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel apache-devel"
 short_desc="Enterprise-class centralized version control for the masses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Apache-2.0, BSD"
 distfiles="http://apache.mirror.rafal.ca/subversion/${pkgname}-${version}.tar.bz2"
-checksum=cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec
-long_desc="
- Apache Subversion is a full-featured version control system originally
- designed to be a better CVS. Subversion has since expanded beyond its
- original goal of replacing CVS, but its basic model, design, and interface
- remain heavily influenced by that goal. Even today, Subversion should still
- feel very familiar to CVS users."
+homepage="http://subversion.apache.org/"
+checksum=fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686
+
+subpackages="${pkgname}-python ${pkgname}-perl ${pkgname}-apache
+ ${pkgname}-gnome-keyring-auth ${pkgname}-devel libsvn"
+
+# XXX enable kwallet when kdelibs is available.
+makedepends="pkg-config perl>=5.16 python-devel swig apr-util-devel
+ libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel
+ sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel
+ neon-devel apache-devel"
 
 do_configure() {
-	./configure --prefix=/usr --with-apxs --disable-javahl \
+	./configure ${CONFIGURE_SHARED_ARGS} \
+		--with-apxs --disable-javahl --disable-static \
 		--without-kwallet --with-gnome-keyring --with-editor=vim \
 		--disable-mod-activation
 }
@@ -27,8 +28,7 @@ do_configure() {
 do_build() {
 	make ${makejobs} external-all
 	make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
-	make ${makejobs} \
-		swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+	make ${makejobs} swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
 		swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
 		swig-py swig-pl
 }
@@ -41,11 +41,18 @@ do_install() {
 		swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
 		install install-swig-py install-swig-pl
 
+	vinstall ${FILESDIR}/svnserve.service 644 usr/lib/systemd/system
+	vinstall ${FILESDIR}/svnserve.tmpfiles 644 usr/lib/tmpfiles.d svnserve.conf
+
 	rm -rf ${DESTDIR}/usr/lib/perl5/core_perl
-	install -d ${DESTDIR}/usr/share/subversion
+	vmkdir usr/share/subversion
 	install -d -m755 tools/hook-scripts ${DESTDIR}/usr/share/subversion/
 	rm -f ${DESTDIR}/usr/share/subversion/hook-scripts/*.in
 
-	install -D -m644 tools/client-side/bash_completion \
-		${DESTDIR}/etc/bash_completion.d/subversion
+	install -Dm644 tools/client-side/bash_completion \
+		${DESTDIR}/usr/share/bash-completion/completions/subversion
+
+	for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
+		ln -sf subversion ${DESTDIR}/usr/share/bash-completion/completions/${i}
+	done
 }