diff --git a/common/shlibs b/common/shlibs
index 6633436612..847eb7eae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1616,6 +1616,7 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 libXaw3d.so.8 libXaw3d-1.6.2_1
 libshiboken-python2.7.so.1.2 libshiboken-python-1.2.2_2
 libshiboken-python3.4.so.1.2 libshiboken-python3.4-1.2.2_2
+libshiboken-python3.5.so.1.2 libshiboken-python3-1.2.2_3
 libpyside-python2.7.so.1.2 libpyside-python-1.2.2_2
 libpyside-python3.4.so.1.2 libpyside-python3.4-1.2.2_2
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
diff --git a/srcpkgs/libshiboken-python3 b/srcpkgs/libshiboken-python3
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/libshiboken-python3
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/libshiboken-python3-devel b/srcpkgs/libshiboken-python3-devel
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/libshiboken-python3-devel
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/python3-shiboken b/srcpkgs/python3-shiboken
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/python3-shiboken
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/shiboken/patches/python3.5.patch b/srcpkgs/shiboken/patches/python3.5.patch
new file mode 100644
index 0000000000..607e9b2673
--- /dev/null
+++ b/srcpkgs/shiboken/patches/python3.5.patch
@@ -0,0 +1,11 @@
+--- cmake/Modules/FindPython3Libs.cmake.orig
++++ cmake/Modules/FindPython3Libs.cmake
+@@ -27,7 +27,7 @@
+ # Search for the python framework on Apple.
+ # CMAKE_FIND_FRAMEWORKS(Python)
+ 
+-FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0)
++FOREACH(_CURRENT_VERSION 3.5 3.4 3.3 3.2 3.1 3.0)
+   IF(_CURRENT_VERSION GREATER 3.1)
+       SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
+   ELSE()
diff --git a/srcpkgs/shiboken/template b/srcpkgs/shiboken/template
index 04a1081512..847b12608f 100644
--- a/srcpkgs/shiboken/template
+++ b/srcpkgs/shiboken/template
@@ -1,13 +1,10 @@
 # Template file for 'shiboken'
 pkgname=shiboken
 version=1.2.2
-revision=2
+revision=3
 wrksrc="shiboken-${version}"
-python_versions="2.7 3.4"
 hostmakedepends="cmake"
-makedepends="python-devel python3.4-devel qt-devel libxml2-devel libxslt-devel"
-replaces="python-shiboken<1.2.2_1 python3.4-shiboken<1.2.2_1
- python-shiboken-devel<1.2.2_1 python3.4-shiboken-devel<1.2.2_1"
+makedepends="python-devel python3-devel qt-devel libxml2-devel libxslt-devel"
 short_desc="CPython bindings generator for C++ libraries"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 homepage="http://www.pyside.org"
@@ -25,12 +22,12 @@ do_build() {
 		-DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_TESTS=OFF"
 
-	for pyver in $python_versions; do
+	for pyver in $py2_ver $py3_ver; do
 		args=
-		if [ "$pyver" = "2.7" ]; then
-			args="-DPYTHON_SUFFIX=-python2.7"
+		if [ "$pyver" = "$py2_ver" ]; then
+			args="-DPYTHON_SUFFIX=-python$py2_ver"
 		else
-			args="-DUSE_PYTHON3=yes -DPYTHON3_EXECUTABLE=/usr/bin/python3.4"
+			args="-DUSE_PYTHON3=yes"
 		fi
 
 		[ ! -d build-${pyver} ] && mkdir build-${pyver}
@@ -41,22 +38,20 @@ do_build() {
 	done
 }
 do_install() {
-	for pyver in $python_versions; do
-		cd ${wrksrc}/build-${pyver}
-		make DESTDIR=${DESTDIR} install
+	for pyver in $py2_ver $py3_ver; do
+		make -C build-${pyver} DESTDIR=${DESTDIR} install
 	done
 }
 post_install() {
 	# Fix conflict between .pc files
 	rm -f ${DESTDIR}/usr/lib/pkgconfig/*
-	for pyver in $python_versions; do
+	for pyver in $py2_ver $py3_ver; do
 		vinstall build-${pyver}/data/shiboken.pc 644 \
 			usr/lib/pkgconfig shiboken-python${pyver}.pc
 	done
 }
 
 libshiboken-common-devel_package() {
-	replaces="python-shiboken-devel<1.2.2_1 python3.4-shiboken-devel<1.2.2_1"
 	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - common development files"
 	pkg_install() {
@@ -66,54 +61,66 @@ libshiboken-common-devel_package() {
 	}
 }
 libshiboken-python-devel_package() {
-	replaces="python-shiboken-devel<1.2.2_1"
 	depends="libshiboken-common-devel-${version}_${revision}
 	 libshiboken-python-${version}_${revision}"
 	short_desc="Python2 shiboken bindings - shared library (development files)"
 	pkg_install() {
-		vmove usr/lib/cmake/Shiboken-${version}/ShibokenConfig-python2.7.cmake
-		vmove usr/lib/pkgconfig/shiboken-python2.7.pc
-		vmove usr/lib/libshiboken-python2.7.so
+		vmove usr/lib/cmake/Shiboken-${version}/ShibokenConfig-python${py2_ver}.cmake
+		vmove usr/lib/pkgconfig/shiboken-python${py2_ver}.pc
+		vmove usr/lib/libshiboken-python${py2_ver}.so
 	}
 }
 libshiboken-python_package() {
-	replaces="python-shiboken<1.2.2_1"
 	short_desc="Python2 shiboken bindings - shared library"
 	pkg_install() {
-		vmove usr/lib/libshiboken-python2.7.so.${version%.*}
-		vmove usr/lib/libshiboken-python2.7.so.${version}
+		vmove usr/lib/libshiboken-python${py2_ver}.so.${version%.*}
+		vmove usr/lib/libshiboken-python${py2_ver}.so.${version}
 	}
 }
 python-shiboken_package() {
-	replaces="python-shiboken<1.2.2_1"
 	short_desc="Python2 shiboken bindings"
 	pkg_install() {
-		vmove usr/lib/python2.7/site-packages/shiboken.so
+		vmove ${py2_sitelib}/shiboken.so
+	}
+}
+libshiboken-python3-devel_package() {
+	replaces="libshiboken-python3.4-devel>=0"
+	depends="libshiboken-common-devel-${version}_${revision}
+	 libshiboken-python3-${version}_${revision}"
+	short_desc="Python3 shiboken bindings - shared library (development files)"
+	pkg_install() {
+		vmove usr/lib/cmake/Shiboken-${version}/ShibokenConfig-python${py3_ver}.cmake
+		vmove usr/lib/pkgconfig/shiboken-python${py3_ver}.pc
+		vmove usr/lib/libshiboken-python${py3_ver}.so
+	}
+}
+libshiboken-python3_package() {
+	replaces="libshiboken-python3.4>=0"
+	short_desc="Python3 shiboken bindings - shared library"
+	pkg_install() {
+		vmove usr/lib/libshiboken-python${py3_ver}.so.${version%.*}
+		vmove usr/lib/libshiboken-python${py3_ver}.so.${version}
+	}
+}
+python3-shiboken_package() {
+	replaces="python3.4-shiboken>=0"
+	short_desc="Python3 shiboken bindings"
+	pkg_install() {
+		vmove ${py3_sitelib}/shiboken.so
 	}
 }
 libshiboken-python3.4-devel_package() {
-	replaces="python3.4-shiboken-devel<1.2.2_1"
-	depends="libshiboken-common-devel-${version}_${revision}
-	 libshiboken-python3.4-${version}_${revision}"
-	short_desc="Python3.4 shiboken bindings - shared library (development files)"
-	pkg_install() {
-		vmove usr/lib/cmake/Shiboken-${version}/ShibokenConfig-python3.4.cmake
-		vmove usr/lib/pkgconfig/shiboken-python3.4.pc
-		vmove usr/lib/libshiboken-python3.4.so
-	}
+	build_style=meta
+	short_desc="Python3.4 shiboken bindings (transitional dummy package)"
+	depends="libshiboken-python3-devel>=${version}_${revision}"
 }
 libshiboken-python3.4_package() {
-	replaces="python3.4-shiboken<1.2.2_1"
-	short_desc="Python3.4 shiboken bindings - shared library"
-	pkg_install() {
-		vmove usr/lib/libshiboken-python3.4.so.${version%.*}
-		vmove usr/lib/libshiboken-python3.4.so.${version}
-	}
+	build_style=meta
+	short_desc="Python3.4 shiboken bindings (transitional dummy package)"
+	depends="libshiboken-python3>=${version}_${revision}"
 }
 python3.4-shiboken_package() {
-	replaces="python3.4-shiboken<1.2.2_1"
-	short_desc="Python3.4 shiboken bindings"
-	pkg_install() {
-		vmove usr/lib/python3.4/site-packages/shiboken.so
-	}
+	build_style=meta
+	short_desc="Python3.4 shiboken bindings (transitional dummy package)"
+	depends="python3-shiboken>=${version}_${revision}"
 }