diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index f3c136f64f0..725ee926946 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,15 +1,13 @@
 # Template file for 'borg'
 pkgname=borg
 version=1.0.7
-revision=2
+revision=3
 wrksrc="borgbackup-${version}"
-build_style=python-module
-hostmakedepends="python3.4-setuptools python3.4-devel libressl-devel
- python3.4-Sphinx python3.4-sphinx_rtd_theme"
-makedepends="${hostmakedepends/python3.4-setuptools/} acl-devel lz4-devel"
-depends="python3.4-llfuse python3.4-msgpack python3.4-setuptools"
-python_versions="3.4"
-pycompile_version="3.4"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-devel libressl-devel
+ python3-Sphinx python3-sphinx_rtd_theme"
+makedepends="${hostmakedepends/python3-setuptools/} acl-devel lz4-devel"
+depends="python3-llfuse python3-msgpack python3-setuptools"
 pycompile_module="borg"
 short_desc="Deduplicating backup program with compression and encryption"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
@@ -25,7 +23,7 @@ pre_build() {
 	fi
 }
 post_build() {
-	PYTHONPATH=.. make -C docs man SPHINXBUILD=sphinx-build3.4
+	PYTHONPATH=.. make -C docs man SPHINXBUILD=sphinx-build3
 }
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/libcap-ng-python3 b/srcpkgs/libcap-ng-python3
new file mode 120000
index 00000000000..414bbce7c7f
--- /dev/null
+++ b/srcpkgs/libcap-ng-python3
@@ -0,0 +1 @@
+libcap-ng
\ No newline at end of file
diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index 8a8b7815878..28f81e5adfa 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'libcap-ng'
 pkgname=libcap-ng
 version=0.7.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-python"
 short_desc="An alternate POSIX capabilities library"
@@ -14,8 +14,8 @@ checksum=c21af997445cd4107a55d386f955c5ea6f6e96ead693e9151277c0ab5f97d05f
 subpackages="libcap-ng-devel libcap-ng-progs"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libcap-ng-python libcap-ng-python3.4"
-	hostmakedepends="python-devel python3.4-devel swig"
+	subpackages+=" libcap-ng-python libcap-ng-python3.4 libcap-ng-python3"
+	hostmakedepends="python-devel python3-devel swig"
 	configure_args+=" --with-python"
 fi
 
@@ -38,22 +38,28 @@ libcap-ng-progs_package() {
 		vmove usr/share
 	}
 }
-libcap-ng-python3.4_package() {
+libcap-ng-python3_package() {
 	lib32disabled=yes
-	short_desc+=" - python3.4 bindings"
-	depends="python3.4"
-	pycompile_module="capng"
-	pycompile_version="3.4"
+	replaces="libcap-ng-python3.4>=0"
+	short_desc+=" - python3 bindings"
+	depends="python3"
+	pycompile_module="capng.py"
 	pkg_install() {
-		vmove "usr/lib/python3.4"
+		vmove ${py3_sitelib}
 	}
 }
 libcap-ng-python_package() {
 	lib32disabled=yes
 	short_desc+=" - python bindings"
 	depends="python"
-	pycompile_module="capng"
+	pycompile_module="capng.py"
 	pkg_install() {
-		vmove "usr/lib/python2*"
+		vmove ${py2_sitelib}
 	}
 }
+libcap-ng-python3.4_package() {
+	lib32disabled=yes
+	build_style=meta
+	short_desc+=" - python3.4 bindings (transitional dummy package)"
+	depends="libcap-ng-python3>=${version}_${revision}"
+}