diff --git a/srcpkgs/python-numpy-devel b/srcpkgs/python-numpy-devel
deleted file mode 120000
index 69b83ae14d8..00000000000
--- a/srcpkgs/python-numpy-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-numpy
\ No newline at end of file
diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template
index 6e25397a587..82694f6e84a 100644
--- a/srcpkgs/python-numpy/template
+++ b/srcpkgs/python-numpy/template
@@ -1,7 +1,8 @@
 # Template file for 'python-numpy'
 pkgname=python-numpy
 version=1.10.1
-revision=1
+revision=2
+replaces="python-numpy-devel>=0"
 wrksrc="numpy-${version}"
 build_style=python-module
 python_versions="2.7 3.4"
@@ -9,7 +10,6 @@ hostmakedepends="python-setuptools python3.4-setuptools gcc-fortran"
 makedepends="python-devel python3.4-devel blas-devel lapack-devel"
 pycompile_module="numpy"
 short_desc="Fast and sophisticated array facility to Python2"
-_short_desc="${short_desc/Python2/Python3.4}"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://www.numpy.org/"
 license="3-clause-BSD"
@@ -23,14 +23,12 @@ LDFLAGS="-shared"
 pre_build() {
 	# make sure _dotblas.so gets built
 	sed -i '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py
-
 	# remove shebangs
 	find numpy -type f -name '*.py' -exec sed -i '/^#!.*python$/d' {} +
 }
 post_install() {
-	# create symlinks for unversioned f2py* scripts
+	# create symlink for unversioned f2py* script
 	ln -sf f2py2.7 ${DESTDIR}/usr/bin/f2py
-	ln -sf f2py3.4 ${DESTDIR}/usr/bin/f2py3
 
 	# create compat symlinks for .h files
 	vmkdir usr/include/python2.7
@@ -42,38 +40,20 @@ post_install() {
 
 	# install f2py*.1 man pages and license
 	vman doc/f2py/f2py.1
-	vman doc/f2py/f2py.1 f2py3.1
+	vman doc/f2py/f2py.1 f2py3.4.1
 	vlicense LICENSE.txt LICENSE
 }
 
-python-numpy-devel_package() {
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include/python2.7
-		vmove usr/lib/python2.7/site-packages/numpy/core/include/numpy
-		vmove usr/lib/python2.7/site-packages/numpy/random/randomkit.h
-		vmove usr/lib/python2.7/site-packages/numpy/f2py/src/fortranobject.h
-	}
-}
 python3.4-numpy_package() {
+	replaces="python3.4-numpy-devel>=0"
 	pycompile_version="3.4"
 	pycompile_module="numpy"
-	short_desc="${_short_desc}"
+	short_desc="${short_desc/Python2/Python3.4}"
 	pkg_install() {
-		vmove usr/bin/f2py3*
+		vmove usr/bin/f2py3.4
 		vmove usr/lib/python3.4
-		vmove usr/share/man/man1/f2py3.1
+		vmove usr/include/python3.4m
+		vmove usr/share/man/man1/f2py3.4.1
 		vlicense LICENSE.txt LICENSE
 	}
 }
-python3.4-numpy-devel_package() {
-	depends="python3.4-numpy-${version}_${revision}"
-	short_desc="${_short_desc} - development files"
-	pkg_install() {
-		vmove usr/include/python3.4m
-		vmove usr/lib/python3.4/site-packages/numpy/core/include/numpy
-		vmove usr/lib/python3.4/site-packages/numpy/random/randomkit.h
-		vmove usr/lib/python3.4/site-packages/numpy/f2py/src/fortranobject.h
-	}
-}
diff --git a/srcpkgs/python3.4-numpy-devel b/srcpkgs/python3.4-numpy-devel
deleted file mode 120000
index 69b83ae14d8..00000000000
--- a/srcpkgs/python3.4-numpy-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-numpy
\ No newline at end of file