diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg
index 33ac97b964e293d42103fcea2c00e532f012c853..93bfaff215626fe0900936382865bb26b717b3b7 100644
--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
@@ -31,9 +31,9 @@ strip-top-level-dir = true
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
+  ${psycopg2:egg}
   slapos.toolbox
   cns.recipe.symlink
-  collective.recipe.distutils
 
 
 
@@ -68,11 +68,15 @@ location =
 [application-configuration]
 location =
 
+[psycopg2-env]
+PATH = ${postgresql:location}/bin:%(PATH)s
+
 
 [psycopg2]
 recipe = zc.recipe.egg:custom
 egg = psycopg2
 define = PSYCOPG_EXTENSIONS,PSYCOPG_DISPLAY_SIZE,PSYCOPG_NEW_BOOLEAN,HAVE_PQFREEMEM,HAVE_PQPROTOCOL3
+environment = psycopg2-env
 include-dirs =
     ${postgresql:location}/include
 library-dirs =
@@ -81,12 +85,3 @@ rpath =
     ${postgresql:location}/lib
 
 
-## this works as well as the above
-#[psycopg2]
-#recipe = collective.recipe.distutils
-#url = http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-2.4.5.tar.gz
-#build_ext =
-#    --pg-config=${postgresql:location}/bin/pg_config
-#    --rpath=${postgresql:location}/lib
-
-