diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index fae6ebc1986..f4411c58998 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -1,7 +1,7 @@
 # Template file for 'subversion'
 pkgname=subversion
 version=1.8.8
-revision=1
+revision=2
 short_desc="Enterprise-class centralized version control for the masses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Apache-2.0, BSD"
@@ -57,14 +57,14 @@ do_install() {
 libsvn_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
-		vmove "usr/lib/libsvn_ra*"
-		vmove "usr/lib/libsvn_fs*"
-		vmove "usr/lib/libsvn_subr*"
-		vmove "usr/lib/libsvn_wc*"
-		vmove "usr/lib/libsvn_delta*"
-		vmove "usr/lib/libsvn_diff*"
-		vmove "usr/lib/libsvn_repos*"
-		vmove "usr/lib/libsvn_client*"
+		vmove "usr/lib/libsvn_ra*.so.*"
+		vmove "usr/lib/libsvn_fs*.so.*"
+		vmove "usr/lib/libsvn_subr*.so.*"
+		vmove "usr/lib/libsvn_wc*.so.*"
+		vmove "usr/lib/libsvn_delta*.so.*"
+		vmove "usr/lib/libsvn_diff*.so.*"
+		vmove "usr/lib/libsvn_repos*.so.*"
+		vmove "usr/lib/libsvn_client*.so.*"
 	}
 }
 
@@ -76,14 +76,16 @@ subversion-apache_package() {
 }
 
 subversion-devel_package() {
-	depends="libsvn>=$version"
+	depends="libsvn>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/*.so
 	}
 }
 
 subversion-gnome-keyring-auth_package() {
+	lib32disabled=yes
 	short_desc+=" - gnome-keyring authentication support"
 	pkg_install() {
 		vmove "usr/lib/libsvn_auth_gnome_keyring*"
@@ -91,6 +93,7 @@ subversion-gnome-keyring-auth_package() {
 }
 
 subversion-kwallet-auth_package() {
+	lib32disabled=yes
 	short_desc+=" - KDE kwallet authentication support"
 	pkg_install() {
 		vmove "usr/lib/libsvn_auth_k*"
@@ -98,6 +101,7 @@ subversion-kwallet-auth_package() {
 }
 
 subversion-python_package() {
+	lib32disabled=yes
 	depends="python"
 	pycompile_module="libsvn svn"
 	short_desc+=" - python bindings"
@@ -108,6 +112,7 @@ subversion-python_package() {
 }
 
 subversion-perl_package() {
+	lib32disabled=yes
 	depends="perl>=5.16"
 	short_desc+=" - perl bindings"
 	pkg_install() {