diff --git a/srcpkgs/python-Pillow-devel b/srcpkgs/python-Pillow-devel
deleted file mode 120000
index bafc9b1001d..00000000000
--- a/srcpkgs/python-Pillow-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-Pillow
\ No newline at end of file
diff --git a/srcpkgs/python-Pillow-qt b/srcpkgs/python-Pillow-qt
deleted file mode 120000
index bafc9b1001d..00000000000
--- a/srcpkgs/python-Pillow-qt
+++ /dev/null
@@ -1 +0,0 @@
-python-Pillow
\ No newline at end of file
diff --git a/srcpkgs/python-Pillow-tk b/srcpkgs/python-Pillow-tk
deleted file mode 120000
index bafc9b1001d..00000000000
--- a/srcpkgs/python-Pillow-tk
+++ /dev/null
@@ -1 +0,0 @@
-python-Pillow
\ No newline at end of file
diff --git a/srcpkgs/python-Pillow/INSTALL.msg b/srcpkgs/python-Pillow/INSTALL.msg
new file mode 100644
index 00000000000..ed660c724dc
--- /dev/null
+++ b/srcpkgs/python-Pillow/INSTALL.msg
@@ -0,0 +1,2 @@
+To use the Tk image interface install python-tkinter.
+To use the Qt image interface install python-PyQt{4,5} or python-pyside.
diff --git a/srcpkgs/python-Pillow/python3.4-Pillow.INSTALL.msg b/srcpkgs/python-Pillow/python3.4-Pillow.INSTALL.msg
new file mode 100644
index 00000000000..1c4e11c3edf
--- /dev/null
+++ b/srcpkgs/python-Pillow/python3.4-Pillow.INSTALL.msg
@@ -0,0 +1,3 @@
+To use the Tk image interface install python3.4-tkinter.
+To use the Qt image interface install python3.4-PyQt{4,5} or
+python3.4-pyside.
diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template
index dc866aebaa7..9fb2309c0ee 100644
--- a/srcpkgs/python-Pillow/template
+++ b/srcpkgs/python-Pillow/template
@@ -1,7 +1,8 @@
 # Template file for 'python-Pillow'
 pkgname=python-Pillow
 version=3.0.0
-revision=2
+revision=3
+replaces="python-Pillow-tk>=0 python-Pillow-qt>=0"
 wrksrc="Pillow-${version}"
 build_style=python-module
 python_versions="2.7 3.4"
@@ -11,19 +12,12 @@ makedepends="python-devel python3.4-devel python-tkinter python3.4-tkinter
  lcms2-devel libwebp-devel tk-devel"
 pycompile_module="PIL"
 short_desc="Python Imaging Library (PIL) fork (Python2)"
-_short_desc="${short_desc/Python2/Python3.4}"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="https://github.com/python-pillow/Pillow"
 license="PIL"
 distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
 checksum=ad50bef540fe5518a4653c3820452a881b6a042cb0f8bb7657c491c6bd3654bb
 
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages="python-Pillow-qt python3.4-Pillow-qt"
-fi
-subpackages+=" python-Pillow-devel python3.4-Pillow-devel python-Pillow-tk
- python3.4-Pillow-tk python3.4-Pillow"
-
 pre_build() {
 	sed -i '/^#!\//,1d' PIL/OleFileIO.py
 }
@@ -32,72 +26,19 @@ post_install() {
 	# rename bins and remove .py suffix
 	for f in convert driver file font print; do
 		vbin build-2.7/scripts-2.7/pil${f}{.py,}
-		vbin build-3.4/scripts-3.4/pil${f}{.py,3}
+		vbin build-3.4/scripts-3.4/pil${f}{.py,3.4}
 	done
 	vlicense LICENSE
 }
 
-python-Pillow-devel_package() {
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmkdir usr/include/python2.7/Imaging
-		vcopy libImaging/*.h usr/include/python2.7/Imaging
-	}
-}
-python-Pillow-qt_package() {
-	depends="${sourcepkg}-${version}_${revision} python-PyQt4"
-	short_desc+=" - Qt interface"
-	pycompile_module="PIL"
-	pkg_install() {
-		vmove usr/lib/python2.7/site-packages/PIL/ImageQt.py
-	}
-}
-python-Pillow-tk_package() {
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - Tk interface"
-	pycompile_module="PIL"
-	pkg_install() {
-		vmove usr/lib/python2.7/site-packages/PIL/ImageTk.py
-		vmove usr/lib/python2.7/site-packages/PIL/SpiderImagePlugin.py
-		vmove usr/lib/python2.7/site-packages/PIL/_imagingtk.so
-	}
-}
 python3.4-Pillow_package() {
-	short_desc="${_short_desc}"
+	replaces="python3.4-Pillow-tk>=0 python3.4-Pillow-qt>=0"
 	pycompile_version="3.4"
 	pycompile_module="PIL"
+	short_desc="${short_desc/Python2/Python3.4}"
 	pkg_install() {
-		vmove usr/bin/*3
+		vmove usr/bin/*3.4
 		vmove usr/lib/python3.4
 		vlicense LICENSE
 	}
 }
-python3.4-Pillow-devel_package() {
-	depends="python3.4-Pillow-${version}_${revision}"
-	short_desc="${_short_desc} - development files"
-	pkg_install() {
-		vmkdir usr/include/python3.4m/Imaging
-		vcopy libImaging/*.h usr/include/python3.4m/Imaging
-	}
-}
-python3.4-Pillow-qt_package() {
-	depends="python3.4-Pillow-${version}_${revision} python3.4-PyQt4"
-	short_desc="${_short_desc} - Qt interface"
-	pycompile_version="3.4"
-	pycompile_module="PIL"
-	pkg_install() {
-		vmove usr/lib/python3.4/site-packages/PIL/ImageQt.py
-	}
-}
-python3.4-Pillow-tk_package() {
-	depends="python3.4-Pillow-${version}_${revision}"
-	short_desc="${_short_desc} - Tk interface"
-	pycompile_version="3.4"
-	pycompile_module="PIL"
-	pkg_install() {
-		vmove usr/lib/python3.4/site-packages/PIL/ImageTk.py
-		vmove usr/lib/python3.4/site-packages/PIL/SpiderImagePlugin.py
-		vmove usr/lib/python3.4/site-packages/PIL/_imagingtk.cpython-34m.so
-	}
-}
diff --git a/srcpkgs/python3.4-Pillow-devel b/srcpkgs/python3.4-Pillow-devel
deleted file mode 120000
index bafc9b1001d..00000000000
--- a/srcpkgs/python3.4-Pillow-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-Pillow
\ No newline at end of file
diff --git a/srcpkgs/python3.4-Pillow-qt b/srcpkgs/python3.4-Pillow-qt
deleted file mode 120000
index bafc9b1001d..00000000000
--- a/srcpkgs/python3.4-Pillow-qt
+++ /dev/null
@@ -1 +0,0 @@
-python-Pillow
\ No newline at end of file
diff --git a/srcpkgs/python3.4-Pillow-tk b/srcpkgs/python3.4-Pillow-tk
deleted file mode 120000
index bafc9b1001d..00000000000
--- a/srcpkgs/python3.4-Pillow-tk
+++ /dev/null
@@ -1 +0,0 @@
-python-Pillow
\ No newline at end of file