diff --git a/SConstruct b/SConstruct
index 8355915c42d77c706e5f822a5d8f104ca1bbfa53..a570db85566e3a8a1b068bb5a47a55bc2afd9ce3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,6 +1,11 @@
 import os
 
-#setup a basic environment
+
+# setup pedi
+if not os.path.isfile("manifest.txt.config"):
+        os.system(os.environ['PEDI_HOME']+'/pedi --setup -m manifest.txt -l turbo -l zafl -l ps -l zipr -l stratafier -l stars -i ' + os.environ['TURBO_INSTALL'])
+
+
 
 #setup a basic environment
 env = Environment(
@@ -32,7 +37,14 @@ Depends([turbod,cli],[rpc])
 
 ret=[rpc,turbod,cli,prepd,zafl]
 
-print "ret=", [str(s) for s in ret]
+
+pedi = Command( target = "./turbo-install",
+                source = [ret],
+                action = 'echo Doing pedi in `pwd`; ' + os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
+
+# decide whether to pedi
+if Dir('.').abspath == Dir('#.').abspath:
+        ret=ret+pedi
 
 Default(ret)
 Return('ret')