diff --git a/srcpkgs/python-numpy-devel b/srcpkgs/python-numpy-devel
new file mode 120000
index 00000000000..69b83ae14d8
--- /dev/null
+++ b/srcpkgs/python-numpy-devel
@@ -0,0 +1 @@
+python-numpy
\ No newline at end of file
diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template
index 0646b0f0251..db8e4f61124 100644
--- a/srcpkgs/python-numpy/template
+++ b/srcpkgs/python-numpy/template
@@ -1,16 +1,90 @@
 # Template file for 'python-numpy'
 pkgname=python-numpy
-version=1.8.1
+version=1.8.2
 revision=1
-build_style=python-module
-pycompile_module="numpy"
-hostmakedepends="python-distribute gcc-fortran"
-makedepends="python-devel"
-depends="python>=2.7"
-short_desc="NumPy adds a fast and sophisticated array facility to Python"
-maintainer="Carlo Dormeletti <carlo.dormeletti@email.it>"
-homepage="http://www.numpy.org"
-license="MIT"
-distfiles="${SOURCEFORGE_SITE}/numpy/NumPy/${version}/numpy-${version}.tar.gz"
-checksum=3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9
 wrksrc="numpy-${version}"
+build_style=python-module
+python_versions="2.7 3.4"
+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"
+maintainer="Carlo Dormeletti <carlo.dormeletti@email.it>"
+homepage="http://www.numpy.org/"
+license="3-clause-BSD"
+distfiles="${SOURCEFORGE_SITE}/numpy/NumPy/${version}/numpy-${version}.tar.gz"
+checksum=ce5743a3a24bf13e0373faeb240b08e48d139e6313f1b5fbfd771057c7a49dbd
+
+export ATLAS=None
+LDFLAGS="-shared"
+
+pre_build() {
+	# make sure _dotblas.so gets built
+	sed -i '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py
+
+	# no tests & docs as installed by default
+	sed -i "/config.add_subpackage('doc')/d;/config.add_data_dir('doc')/d" numpy/setup.py
+	sed -i "/config.add_data_dir('tests\/data')/d" numpy/core/setup.py
+	sed -i "/config.add_data_dir('docs')/d" numpy/f2py/setup.py
+	sed -i "/config.add_data_dir('tests')/d" numpy/setup.py numpy/*/setup.py
+
+	# remove *.c source files
+	sed -i "/config.add_data_files('mingw\/gfortran_vs2003_hack.c')/d" numpy/distutils/setup.py
+	sed -i "/config.add_data_files/,+3d" numpy/f2py/setup.py
+}
+
+post_install() {
+	# create symlinks for unversioned f2py* scripts
+	ln -sf f2py2.7 ${DESTDIR}/usr/bin/f2py
+	ln -sf f2py3.4 ${DESTDIR}/usr/bin/f2py3
+
+	# fix shebangs for python3.4
+	cd ${DESTDIR}/usr/lib/python3.4/site-packages/numpy
+	find . -name '*.py' -exec sed -i -e 's,#!.*python$,&3.4,' {} +
+
+	# create symlinks for .h files
+	vmkdir usr/include/python2.7
+	ln -sf /usr/lib/python2.7/site-packages/numpy/core/include/numpy ${DESTDIR}/usr/include/python2.7/numpy
+	vmkdir usr/include/python3.4
+	ln -sf /usr/lib/python3.4/site-packages/numpy/core/include/numpy ${DESTDIR}/usr/include/python3.4/numpy
+
+	# install f2py*.1 man pages
+	vman ${wrksrc}/numpy/f2py/f2py.1
+	vman ${wrksrc}/numpy/f2py/f2py.1 f2py3.1
+
+	vlicense ${wrksrc}/LICENSE.txt LICENSE
+}
+
+python3.4-numpy_package() {
+	pycompile_version="3.4"
+	pycompile_module="numpy"
+	short_desc="${short_desc/Python2/Python3.4}"
+	pkg_install() {
+		vmove usr/bin/f2py3*
+		vmove usr/lib/python3.4
+		vmove usr/share/man/man1/f2py3.1
+		vlicense ${wrksrc}/LICENSE.txt LICENSE
+	}
+}
+
+python-numpy-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include/python2.7/numpy
+		vmove usr/lib/python2.7/site-packages/numpy/core/include/numpy
+		vmove usr/lib/python2.7/site-packages/numpy/numarray/include/numpy
+		vmove usr/lib/python2.7/site-packages/numpy/random/randomkit.h
+	}
+}
+
+python3.4-numpy-devel_package() {
+	depends="python3.4-numpy>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include/python3.4/numpy
+		vmove usr/lib/python3.4/site-packages/numpy/core/include/numpy
+		vmove usr/lib/python3.4/site-packages/numpy/numarray/include/numpy
+		vmove usr/lib/python3.4/site-packages/numpy/random/randomkit.h
+	}
+}
diff --git a/srcpkgs/python3.4-numpy b/srcpkgs/python3.4-numpy
new file mode 120000
index 00000000000..69b83ae14d8
--- /dev/null
+++ b/srcpkgs/python3.4-numpy
@@ -0,0 +1 @@
+python-numpy
\ No newline at end of file
diff --git a/srcpkgs/python3.4-numpy-devel b/srcpkgs/python3.4-numpy-devel
new file mode 120000
index 00000000000..69b83ae14d8
--- /dev/null
+++ b/srcpkgs/python3.4-numpy-devel
@@ -0,0 +1 @@
+python-numpy
\ No newline at end of file