diff --git a/Makefile b/Makefile
index 44d7847e..8253467c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
 all:
-	cd Tools/unix ; make
-	cd Source ; make
-	cd Source/Images ; make
+	$(MAKE) --directory Tools/unix
+	$(MAKE) --directory Source
+	$(MAKE) --directory Source/Images
 
 clean:
-	cd Tools/unix ; make clean
-	cd Source ; make clean
-	cd Binary ; make clean
+	$(MAKE) --directory Tools/unix clean
+	$(MAKE) --directory Source clean
+	$(MAKE) --directory Binary clean
 
 clobber:
-	cd Tools/unix ; make clobber
-	cd Source ; make clobber
-	cd Binary ; make clobber
+	$(MAKE) --directory Tools/unix clobber
+	$(MAKE) --directory Source  clobber
+	$(MAKE) --directory Binary clobber
 	rm -f typescript
 
 diff:
-	cd Source ; make diff
+	$(MAKE) --directory diff
 
diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc
index 4d0c5583..0de5bc5e 100644
--- a/Tools/Makefile.inc
+++ b/Tools/Makefile.inc
@@ -94,6 +94,8 @@ ifeq ($(UNAME), Linux)
 	$(BSTC) -e -l $<
 endif
 
+.ONESHELL:
+
 #
 # darwin bstc won't run, since mac os does not do 32 bit binaries any more
 # openspin ought to work
@@ -108,7 +110,7 @@ endif
 #
 all:: $(OBJECTS)
 	@for dir in $(SUBDIRS) ; do \
-		( echo "building in `pwd`/$$dir" ; cd "$$dir" ; make all ) ; \
+		( echo "building in `pwd`/$$dir" ; $(MAKE) --directory "$$dir" all ) ; \
 	done
 	@if [ "$(DEST)" ] ; then for file in $(OBJECTS) ; do \
 		mkdir -p $(DEST) ; \