diff --git a/common/shlibs b/common/shlibs
index ec27dea30d..dc93d472b1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1574,7 +1574,8 @@ libosmoctrl.so.0 libosmocore-0.7.0_1
 libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
 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 python-shiboken-1.2.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
 libpyside-python2.7.so.1.2 python-pyside-1.2.2_1
 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
@@ -1643,7 +1644,6 @@ libdar.so.5000 libdar-2.4.14_1
 libpython3.so python3.4-3.4.1_1
 libpython3.4m.so.1.0 python3.4-3.4.1_1
 libbrscandec2.so.1 brother-brscan3-0.2.11_2
-libshiboken.cpython-34m.so.1.2 python3.4-shiboken-1.2.2_2
 libpyside.cpython-34m.so.1.2 python3.4-pyside-1.2.2_2
 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
diff --git a/srcpkgs/libshiboken-common-devel b/srcpkgs/libshiboken-common-devel
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/libshiboken-common-devel
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/libshiboken-python b/srcpkgs/libshiboken-python
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/libshiboken-python
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/libshiboken-python-devel b/srcpkgs/libshiboken-python-devel
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/libshiboken-python-devel
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/libshiboken-python3.4 b/srcpkgs/libshiboken-python3.4
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/libshiboken-python3.4
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/libshiboken-python3.4-devel b/srcpkgs/libshiboken-python3.4-devel
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/libshiboken-python3.4-devel
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/python-shiboken b/srcpkgs/python-shiboken
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/python-shiboken
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/python-shiboken-devel b/srcpkgs/python-shiboken-devel
deleted file mode 120000
index bfad537eb7..0000000000
--- a/srcpkgs/python-shiboken-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-shiboken
\ No newline at end of file
diff --git a/srcpkgs/python-shiboken/template b/srcpkgs/python-shiboken/template
deleted file mode 100644
index e7c26dbcca..0000000000
--- a/srcpkgs/python-shiboken/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-shiboken'
-pkgname=python-shiboken
-_realname=shiboken
-version=1.2.2
-revision=1
-build_style="cmake"
-hostmakedepends="python cmake"
-makedepends="python-devel qt-devel"
-depends="python>=2.7"
-short_desc="Support library for Python bindings"
-maintainer="Enno Boland <eb@s01.de>"
-homepage="http://www.pyside.org"
-license="LGPL"
-distfiles="http://download.qt-project.org/official_releases/pyside/${_realname}-${version}.tar.bz2"
-checksum=7625bbcf1fe313fd910c6b8c9cf49ac5495499f9d00867115a2f1f2a69fce5c4
-wrksrc=${_realname}-${version}
-
-python-shiboken-devel_package() {
-	depends="python-shiboken>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}
diff --git a/srcpkgs/python-shiboken/update b/srcpkgs/python-shiboken/update
deleted file mode 100644
index f8273a389c..0000000000
--- a/srcpkgs/python-shiboken/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=$_realname
diff --git a/srcpkgs/python3.4-shiboken b/srcpkgs/python3.4-shiboken
new file mode 120000
index 0000000000..ab43ecb27f
--- /dev/null
+++ b/srcpkgs/python3.4-shiboken
@@ -0,0 +1 @@
+shiboken
\ No newline at end of file
diff --git a/srcpkgs/python3.4-shiboken-devel b/srcpkgs/python3.4-shiboken-devel
deleted file mode 120000
index 03eb75f1b1..0000000000
--- a/srcpkgs/python3.4-shiboken-devel
+++ /dev/null
@@ -1 +0,0 @@
-python3.4-shiboken
\ No newline at end of file
diff --git a/srcpkgs/python3.4-shiboken/template b/srcpkgs/python3.4-shiboken/template
deleted file mode 100644
index 68a3bbaf75..0000000000
--- a/srcpkgs/python3.4-shiboken/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python3.4-shiboken'
-pkgname=python3.4-shiboken
-_realname=shiboken
-version=1.2.2
-revision=2
-build_style="cmake"
-hostmakedepends="cmake python3.4"
-makedepends="python3.4-devel qt-devel"
-depends="python3.4"
-short_desc="Support library for Python3 bindings"
-maintainer="Enno Boland <eb@s01.de>"
-homepage="http://www.pyside.org"
-license="LGPL"
-distfiles="http://download.qt-project.org/official_releases/pyside/${_realname}-${version}.tar.bz2"
-checksum=7625bbcf1fe313fd910c6b8c9cf49ac5495499f9d00867115a2f1f2a69fce5c4
-wrksrc=${_realname}-${version}
-configure_args="-DUSE_PYTHON3=yes"
-
-python3.4-shiboken-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/cmake
-		vmove "usr/lib/*.so"
-		vmove usr/share
-	}
-}
diff --git a/srcpkgs/python3.4-shiboken/update b/srcpkgs/python3.4-shiboken/update
deleted file mode 100644
index 24a0f2f005..0000000000
--- a/srcpkgs/python3.4-shiboken/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=${_realname}
diff --git a/srcpkgs/shiboken/template b/srcpkgs/shiboken/template
new file mode 100644
index 0000000000..f1e0c3e7f8
--- /dev/null
+++ b/srcpkgs/shiboken/template
@@ -0,0 +1,119 @@
+# Template file for 'shiboken'
+pkgname=shiboken
+version=1.2.2
+revision=2
+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"
+short_desc="CPython bindings generator for C++ libraries"
+maintainer="Enno Boland <eb@s01.de>"
+homepage="http://www.pyside.org"
+license="LGPL-2.1"
+distfiles="https://download.qt.io/official_releases/pyside/shiboken-${version}.tar.bz2"
+checksum=7625bbcf1fe313fd910c6b8c9cf49ac5495499f9d00867115a2f1f2a69fce5c4
+
+pre_build() {
+	# Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake
+	sed -i "/get_config_var('SOABI')/d" cmake/Modules/FindPython3InterpWithDebug.cmake
+}
+do_build() {
+	local args= configure_args="
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_TESTS=OFF"
+
+	for pyver in $python_versions; do
+		args=
+		if [ "$pyver" = "2.7" ]; then
+			args="-DPYTHON_SUFFIX=-python2.7"
+		else
+			args="-DUSE_PYTHON3=yes -DPYTHON3_EXECUTABLE=/usr/bin/python3.4"
+		fi
+
+		[ ! -d build-${pyver} ] && mkdir build-${pyver}
+		pushd build-${pyver}
+		cmake .. ${configure_args} ${args}
+		make ${makejobs}
+		popd
+	done
+}
+do_install() {
+	for pyver in $python_versions; do
+		cd ${wrksrc}/build-${pyver}
+		make DESTDIR=${DESTDIR} install
+	done
+}
+post_install() {
+	# Fix conflict between .pc files
+	rm -f ${DESTDIR}/usr/lib/pkgconfig/*
+	for pyver in $python_versions; 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() {
+		vmove usr/include
+		vmove usr/lib/cmake/Shiboken-${version}/ShibokenConfig.cmake
+		vmove usr/lib/cmake/Shiboken-${version}/ShibokenConfigVersion.cmake
+	}
+}
+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
+	}
+}
+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}
+	}
+}
+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
+	}
+}
+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
+	}
+}
+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}
+	}
+}
+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
+	}
+}