diff --git a/Makefile b/Makefile
index 0dee29068..04d3d30f2 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ doxy: pullsource
 # Remove generated content (Sphinx and doxygen)
 
 clean:
-	$(Q)rm -fr $(BUILDDIR) doxygen hypervisor devicemodel
+	$(Q)rm -fr $(BUILDDIR) doxygen _source
 
 # Copy material over to the GitHub pages staging repo
 
diff --git a/scripts/pullsource.sh b/scripts/pullsource.sh
index 2b9c99acd..194caf2a2 100755
--- a/scripts/pullsource.sh
+++ b/scripts/pullsource.sh
@@ -3,16 +3,25 @@
 # pull fresh copies of the ACRN source and copy public API headers
 # over to the documentation tree
 
+if [ ! -d "../acrn-hypervisor" ]; then
+  echo Repo for acrn-hypervisor is missing.
+  exit -1
+fi
+if [ ! -d "../acrn-devicemodel" ]; then
+  echo Repo for acrn-devicemodel is missing.
+  exit -1
+fi
+
 cd ../acrn-hypervisor;git pull
 
-mkdir -p ../acrn_documentation/_source/hypervisor/include/common
-cp include/common/hypercall.h ../acrn_documentation/_source/hypervisor/include/common
+mkdir -p ../acrn-documentation/_source/hypervisor/include/common
+cp include/common/hypercall.h ../acrn-documentation/_source/hypervisor/include/common
 
-mkdir -p ../acrn_documentation/_source/hypervisor/include/public
-cp include/public/acrn_common.h ../acrn_documentation/_source/hypervisor/include/public
-cp include/public/acrn_hv_defs.h ../acrn_documentation/_source/hypervisor/include/public
+mkdir -p ../acrn-documentation/_source/hypervisor/include/public
+cp include/public/acrn_common.h ../acrn-documentation/_source/hypervisor/include/public
+cp include/public/acrn_hv_defs.h ../acrn-documentation/_source/hypervisor/include/public
 
 cd ../acrn-devicemodel;git pull
 
-mkdir -p ../acrn_documentation/_source/devicemodel/include
-cp include/virtio.h ../acrn_documentation/_source/devicemodel/include
+mkdir -p ../acrn-documentation/_source/devicemodel/include
+cp include/virtio.h ../acrn-documentation/_source/devicemodel/include