diff --git a/.gitattributes b/.gitattributes
index e501f6fa274f5008912cdf4fd1d944d7e2d03b74..13d301c435bb1cac16f07ba7ebf821560f9b80fc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
 /clean-all.sh -text
 /get-peasoup-packages.sh -text
 /irdb_vars -text
+/manifest.txt -text
 /postgres_setup.sh -text
 /set_command_envs -text
 /set_env_vars -text
diff --git a/build-all.sh b/build-all.sh
index 905c06b4e51d429cbb66346b6df72b4750bb2577..581ac6c27f1079647d0bb0dd9801eec80165eda4 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -19,6 +19,10 @@ mkdir -p $ZEST_RUNTIME/lib64
 mkdir -p $ZEST_RUNTIME/bin
 mkdir -p $ZEST_RUNTIME/sbin
 
+if [ ! -f manifest.txt.config ]; then
+	$PEDI_HOME/pedi --setup -m manifest.txt -l ida -l ida_key -l ps -l zipr -l stratafier -l stars -i $PS_INSTALL
+fi
+
 # stratafier
 cd $PEASOUP_UMBRELLA_DIR/stratafier
 make || exit
@@ -111,6 +115,8 @@ scons -j 3|| exit
 
 cd $PEASOUP_UMBRELLA_DIR
 
+$PEDI_HOME/pedi -m manifest.txt 
+
 echo
 echo
 echo  "peasoup/cfar_umbrella Overall build complete."
diff --git a/irdb_vars b/irdb_vars
index 634b8266825d44912fd28586ee269f2d1110af99..350fb7258f7a49f7859f34a299010db6393eae0a 100644
--- a/irdb_vars
+++ b/irdb_vars
@@ -1,4 +1,12 @@
-export PGHOST=127.0.0.1
-export PGUSER=$USER
-export PGPORT=5432
-export PGDATABASE=peasoup_$USER
+if [ -z $PGHOST ]; then 
+	export PGHOST=127.0.0.1
+fi
+if [ -z $PGUSER ]; then 
+	export PGUSER=$USER
+fi
+if [ -z $PGPORT ]; then 
+	export PGPORT=5432
+fi
+if [ -z $PGDATABASE ]; then 
+	export PGDATABASE=peasoup_$USER
+fi
diff --git a/manifest.txt b/manifest.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0454b13fe28f02e230987e46babeca67bfe06b53
--- /dev/null
+++ b/manifest.txt
@@ -0,0 +1,11 @@
+
+submanifest security_transforms/manifest.txt
+submanifest peasoup_examples/manifest.txt
+submanifest idaproCur/manifest.txt
+submanifest SMPStaticAnalyzer/manifest.txt
+submanifest zipr_install/manifest.txt
+submanifest stratafier/manifest.txt
+file set_command_envs ps
+file set_env_vars ps
+file set_ida_server ps
+file irdb_vars ps
diff --git a/set_env_vars b/set_env_vars
index af92280e6aafc4b4ad56e8ddf70082690ad57cb8..bcca12ff0c84500144fb4faa2361bf5701f4375a 100644
--- a/set_env_vars
+++ b/set_env_vars
@@ -1,6 +1,7 @@
 
 
 export PEASOUP_UMBRELLA_DIR=`pwd`
+export PEDI_HOME=$PEASOUP_UMBRELLA_DIR/pedi
 export STRATAFIER_OBJCOPY=$PEASOUP_UMBRELLA_DIR/binutils-2.19/binutils/objcopy
 export TOOLCHAIN=$PEASOUP_UMBRELLA_DIR/diablo_toolchain
 export PEASOUP_HOME=$PEASOUP_UMBRELLA_DIR/peasoup_examples
@@ -19,11 +20,15 @@ export ZIPR_SDK=$PEASOUP_UMBRELLA_DIR/zipr_sdk
 export ZIPR_SCFI_PLUGIN=$PEASOUP_UMBRELLA_DIR/zipr_scfi_plugin
 export SECURITY_TRANSFORMS_HOME=$PEASOUP_UMBRELLA_DIR/security_transforms
 export IRDB_TRANSFORMS=$PEASOUP_UMBRELLA_DIR/irdb_transforms
-export PS=$PEASOUP_HOME/tools/ps_analyze.sh
-export PSZ=$PEASOUP_HOME/tools/ps_zipr.sh 
 export ZEST_RUNTIME=$PEASOUP_UMBRELLA_DIR/zest_runtime
 export DAFFY_HOME=$PEASOUP_UMBRELLA_DIR/daffy
 
+if [ -z $PS_INSTALL ]; then
+	export PS_INSTALL=$PEASOUP_UMBRELLA_DIR/installed
+fi
+export PS=$PS_INSTALL/peasoup_examples/tools/ps_analyze.sh
+export PSZ=$PS_INSTALL/peasoup_examples/tools/ps_zipr.sh 
+
 source ./irdb_vars
 source $PEASOUP_UMBRELLA_DIR/set_command_envs
 
diff --git a/svn.externals.uva_dev b/svn.externals.uva_dev
index b882aec2cd744f11b915d673887ecae36d1ebb4a..2e0b7b9e9ce997aa895a214bf5dc9c4d175c548f 100644
--- a/svn.externals.uva_dev
+++ b/svn.externals.uva_dev
@@ -17,3 +17,4 @@ zipr_large_only_plugin     	http://svn.zephyr-software.com/repos/zipr_large_only
 zipr_push64_reloc_plugin     	http://svn.zephyr-software.com/repos/zipr_push64_reloc_plugin/trunk
 daffy            		http://svn.zephyr-software.com/repos/daffy/trunk/
 IdaProServer         		http://svn.zephyr-software.com/repos/IdaProServer/trunk/
+pedi         			http://svn.zephyr-software.com/repos/pedi/trunk/