diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 16081f28dbb4c2eab95d0ffa93961ecc1242c30a..8fb516a49160064f945e29c40263562ebbce80d5 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -185,6 +185,9 @@ LCGPackage_Add(
   INSTALL_COMMAND make install ${library_path}=${Python_home}/lib:$ENV{${library_path}} PYTHONPATH=:${cython_v_pythonpath}:$ENV{PYTHONPATH} LIBRARY_PATH=${Python_home}/lib PATH=${cython_v_home}/bin:${Python_home}/bin:$ENV{PATH}
   BUILD_IN_SOURCE 1
   DEPENDS Python Boost cython-<yoda_<VERSION>_cython> 
+  IF NOT <VERSION> VERSION_LESS 1.3.1 THEN
+    numpy
+  ENDIF
 )
 
 #---heputils-------------------------------------------------------------------------------------------
diff --git a/generators/environment/numpy.template b/generators/environment/numpy.template
new file mode 100644
index 0000000000000000000000000000000000000000..c1fe60d3f57cb4ff3e1ff55ac6a2b2a7b5fac6a3
--- /dev/null
+++ b/generators/environment/numpy.template
@@ -0,0 +1,4 @@
+PYANALYSIS_VERSION=$(ls -t $LCGDIR/pyanalysis/ | head -1)
+PYTHON_VERSION_SHORT="$(python -c "import platform; print '.'.join(platform.python_version_tuple()[0:2])")"
+export PYANALYSIS_HOME=$LCGDIR/pyanalysis/$PYANALYSIS_VERSION/$PLATFORM
+export PYTHONPATH=${PYANALYSIS_HOME}/lib/python$PYTHON_VERSION_SHORT/site-packages:$PYTHONPATH