diff --git a/srcpkgs/python-unicorn b/srcpkgs/unicorn-python
similarity index 100%
rename from srcpkgs/python-unicorn
rename to srcpkgs/unicorn-python
diff --git a/srcpkgs/unicorn-python3 b/srcpkgs/unicorn-python3
new file mode 120000
index 00000000000..20c8576391e
--- /dev/null
+++ b/srcpkgs/unicorn-python3
@@ -0,0 +1 @@
+unicorn
\ No newline at end of file
diff --git a/srcpkgs/unicorn/template b/srcpkgs/unicorn/template
index d1cb62e9acd..2588f47b7ff 100644
--- a/srcpkgs/unicorn/template
+++ b/srcpkgs/unicorn/template
@@ -1,9 +1,9 @@
 # Template file for 'unicorn'
 pkgname=unicorn
 version=0.9
-revision=2
+revision=3
 only_for_archs="x86_64 x86_64-musl i686 i686-musl"
-hostmakedepends="pkg-config python-setuptools python3.4-setuptools"
+hostmakedepends="pkg-config python-devel python3-devel"
 makedepends="glib-devel"
 short_desc="Lightweight multi-platform, multi-architecture CPU emulator framework"
 maintainer="Michael Gehring <mg@ebfe.org>"
@@ -24,15 +24,15 @@ do_build() {
 	make
 	make -C bindings
 	cd bindings/python
-	for pyver in 2.7 3.4; do
+	for pyver in $py2_ver $py3_ver; do
 		python${pyver} setup.py build --build-base=build-${pyver}
 	done
 }
 
 do_install() {
-	make DESTDIR=${PKGDESTDIR} install
+	make DESTDIR=${DESTDIR} install
 	cd bindings/python
-	for pyver in 2.7 3.4; do
+	for pyver in $py2_ver $py3_ver; do
 		python${pyver} setup.py build --build-base=build-${pyver} \
 			install --prefix=/usr --root=${DESTDIR}
 	done
@@ -48,24 +48,26 @@ unicorn-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-python-unicorn_package() {
+unicorn-python_package() {
+	replaces="python-unicorn>=0"
 	depends="${sourcepkg}-devel>=${version}_${revision}"
 	short_desc+=" - Python2 bindings"
-	pycompile_version="2.7"
 	pycompile_module="unicorn"
 	pkg_install() {
-		vmove usr/lib/python2.7
+		vmove ${py2_sitelib}
 	}
 }
-
-python3.4-unicorn_package() {
+unicorn-python3_package() {
+	replaces="python3.4-unicorn>=0"
 	depends="${sourcepkg}-devel>=${version}_${revision}"
-	short_desc+=" - Python3.4 bindings"
-	pycompile_version="3.4"
+	short_desc+=" - Python3 bindings"
 	pycompile_module="unicorn"
 	pkg_install() {
-		vmove usr/lib/python3.4
+		vmove ${py3_sitelib}
 	}
 }
-
+python3.4-unicorn_package() {
+	build_style=meta
+	short_desc+=" - Python3.4 bindings (transitional dummy package)"
+	depends="unicorn-python3>=${version}_${revision}"
+}