diff --git a/tools/setup b/tools/setup
index a8d98252..518b6520 100755
--- a/tools/setup
+++ b/tools/setup
@@ -47,8 +47,8 @@ else
 fi
 
 if [ $docbook = 1 ] ; then
-	cd doc && make
+	( cd doc && make )
 fi
 
 # Untar libtap
-cd external && tar --gzip -xf tap-1.01-altinity.tar.gz
+( cd external && tar --gzip -xf tap-1.01-altinity.tar.gz )