diff --git a/srcpkgs/python-tables/template b/srcpkgs/python-tables/template
index d945105a18e..80903679e50 100644
--- a/srcpkgs/python-tables/template
+++ b/srcpkgs/python-tables/template
@@ -1,16 +1,15 @@
 # Template file for 'python-tables'
 pkgname=python-tables
 version=3.3.0
-revision=1
+revision=2
 wrksrc="${pkgname#*-}-${version}"
 build_style=python-module
-python_versions="2.7 3.4"
 pycompile_module="tables"
 # XXX: c-blosc (using internal for now)
-hostmakedepends="python-setuptools python3.4-setuptools"
-makedepends="python-devel python3.4-devel python-numpy python3.4-numpy
- python-Cython python3.4-Cython hdf5-devel lzo-devel bzip2-devel"
-depends="python-setuptools python-numpy python-numexpr"
+hostmakedepends="python-setuptools python3-setuptools"
+makedepends="python-devel python3-devel python-numpy python3-numpy
+ python-Cython python3-Cython hdf5-devel lzo-devel bzip2-devel"
+depends="python-setuptools python-numpy python-numexpr python-six"
 short_desc="Hierarchical datasets for Python2"
 maintainer="pulux <pulux@pf4sh.de>"
 license="3-clause-BSD"
@@ -19,32 +18,37 @@ distfiles="${PYPI_SITE}/t/tables/tables-${version}.tar.gz"
 checksum=8383ccf02e041a5d55494a09fc5514140b4653055a2732c981b5fd0f7408822c
 
 alternatives="
- tables:pt2to3:/usr/bin/pt2to32.7
- tables:ptdump:/usr/bin/ptdump2.7
- tables:ptrepack:/usr/bin/ptrepack2.7
- tables:pttree:/usr/bin/pttree2.7"
+ tables:pt2to3:/usr/bin/python2-pt2to3
+ tables:ptdump:/usr/bin/ptdump2
+ tables:ptrepack:/usr/bin/ptrepack2
+ tables:pttree:/usr/bin/pttree2"
 
-pre_build() {
-	# don't build with -march=native
-	sed -i 's|"-march=native", ||' setup.py
-}
 post_install() {
 	vlicense LICENSE.txt LICENSE
+	# XXX: override the default naming scheme for pt2to3
+	cp -a ${DESTDIR}/usr/bin/{,python3-}pt2to3
+	mv ${DESTDIR}/usr/bin/{,python2-}pt2to3
 }
 
-python3.4-tables_package() {
+python3-tables_package() {
 	alternatives="
-	 tables:pt2to3:/usr/bin/pt2to33.4
-	 tables:ptdump:/usr/bin/ptdump3.4
-	 tables:ptrepack:/usr/bin/ptrepack3.4
-	 tables:pttree:/usr/bin/pttree3.4"
-	pycompile_version="3.4"
+	 tables:pt2to3:/usr/bin/python3-pt2to3
+	 tables:ptdump:/usr/bin/ptdump3
+	 tables:ptrepack:/usr/bin/ptrepack3
+	 tables:pttree:/usr/bin/pttree3"
 	pycompile_module="tables"
-	depends="python3.4-setuptools python3.4-numpy python3.4-numexpr"
-	short_desc="${short_desc/Python2/Python3.4}"
+	replaces="python3.4-tables>=0"
+	depends="python3-setuptools python3-numpy python3-numexpr python3-six"
+	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/bin/*3.4
-		vmove usr/lib/python3.4
+		vmove usr/bin/python3-pt2to3
+		vmove usr/bin/pt*3
+		vmove usr/lib/python3*
 		vlicense LICENSE.txt LICENSE
 	}
 }
+python3.4-tables_package() {
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-tables>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-tables b/srcpkgs/python3-tables
new file mode 120000
index 00000000000..7669d9ef0de
--- /dev/null
+++ b/srcpkgs/python3-tables
@@ -0,0 +1 @@
+python-tables
\ No newline at end of file