diff --git a/build-all.sh b/build-all.sh
index 581ac6c27f1079647d0bb0dd9801eec80165eda4..02b52e90daaac774ffca98a1198ccd65c4cfa1aa 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -20,6 +20,9 @@ mkdir -p $ZEST_RUNTIME/bin
 mkdir -p $ZEST_RUNTIME/sbin
 
 if [ ! -f manifest.txt.config ]; then
+	if [ ! -d "$PS_INSTALL" ]; then
+		mkdir "$PS_INSTALL"
+	fi
 	$PEDI_HOME/pedi --setup -m manifest.txt -l ida -l ida_key -l ps -l zipr -l stratafier -l stars -i $PS_INSTALL
 fi
 
diff --git a/clean-all.sh b/clean-all.sh
index 8e3931c250f995b0b563f5703434a0f92d6dbbd5..59ef231fd99fa93ae8bf79cc500438be84cd56b9 100755
--- a/clean-all.sh
+++ b/clean-all.sh
@@ -59,5 +59,13 @@ if [ -d $ZIPR_HOME ]; then
 	scons -c || exit
 fi
 
+
 cd $PEASOUP_UMBRELLA_DIR
 
+# clean up installation
+$PEDI_HOME/pedi -c -m manifest.txt
+if [ -d "$PS_INSTALL" ]; then
+	echo "removing $PS_INSTALL"
+	rm -fr "$PS_INSTALL"
+fi
+