diff --git a/build-all.sh b/build-all.sh
index 4ec489fc9a5233908b25e8138fc2a0310b5725bc..3cf2f7cd16a0acfe451be54716027784db7bc1ec 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -104,8 +104,13 @@ fi
 cd $PEASOUP_UMBRELLA_DIR/zipr_large_only_plugin/
 scons -j 3|| exit
 
-cd $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin/
-scons -j 3|| exit
+if [ -e zipr ] ; then
+	cd $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin/
+	scons -j 3|| exit
+
+	cd $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin/
+	scons -j 3|| exit
+fi
 
 cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin
 scons -j 3|| exit
diff --git a/clean-all.sh b/clean-all.sh
index 5a45a6fe990ed496617af53313613bde9daf469e..afa98f7b6b8357932eb1c942f5654178b25b5ed3 100755
--- a/clean-all.sh
+++ b/clean-all.sh
@@ -48,8 +48,13 @@ if [ -d "$PEASOUP_UMBRELLA_DIR/zipr_large_only_plugin/" ]; then
 	scons -c || exit
 fi
 
-cd $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin/
-scons -c || exit
+if [ -f zipr ]; then
+	cd $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin/
+	scons -c || exit
+
+	cd $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin/
+	scons -c || exit
+fi
 
 cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin
 scons -c || exit
diff --git a/svn.externals.uva_dev b/svn.externals.uva_dev
index d992adabb170ec5b736fea145e2c49ec1b660155..8e2c3708f2a9eb9bdc09ae5670854e8509645aa9 100644
--- a/svn.externals.uva_dev
+++ b/svn.externals.uva_dev
@@ -15,6 +15,7 @@ zipr_scfi_plugin     		http://svn.zephyr-software.com/repos/zipr_scfi_plugin/tru
 zipr_unpin_plugin     		http://svn.zephyr-software.com/repos/zipr_unpin_plugin/trunk
 zipr_large_only_plugin     	http://svn.zephyr-software.com/repos/zipr_large_only_plugin/trunk
 zipr_relax_plugin     		http://svn.zephyr-software.com/repos/zipr_relax_plugin/trunk
+zipr_trace_plugin     		http://svn.zephyr-software.com/repos/zipr_trace_plugin/trunk
 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/