diff --git a/Makefile b/Makefile
index b46055b4e..730eb5896 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ root/.built: \
 	touch root/.built
 
 
-$(CPYTHONLIB): emsdk/emsdk/emsdk
+$(CPYTHONLIB): emsdk/emsdk/emsdk/.complete
 	make -C $(CPYTHONROOT)
 
 
@@ -173,5 +173,5 @@ build/packages.json: $(CPYTHONLIB)
 	make -C packages
 
 
-emsdk/emsdk/emsdk:
+emsdk/emsdk/emsdk/.complete:
 	make -C emsdk
diff --git a/emsdk/Makefile b/emsdk/Makefile
index 28eae6d96..594ecfcfe 100644
--- a/emsdk/Makefile
+++ b/emsdk/Makefile
@@ -1,9 +1,10 @@
-all: emsdk/emsdk
+all: emsdk/emsdk/.complete
 
 # We hack the CPU_CORES, because if you use all of the cores on Circle-CI, you
 # run out of memory
 
-emsdk/emsdk:
+emsdk/emsdk/.complete:
+	if [ -d emsdk ]; then rm -rf emsdk; fi
 	git clone https://github.com/juj/emsdk.git
 	sed -i -e "s#CPU_CORES = max(multiprocessing.cpu_count()-1, 1)#CPU_CORES = 3#g" emsdk/emsdk
 	( \
@@ -16,7 +17,8 @@ emsdk/emsdk:
     make ; \
 	  cd ../.. ; \
     cp binaryen/tag-1.38.4/bin/binaryen.js binaryen/tag-1.38.4_64bit_binaryen/bin ; \
-		./emsdk activate --embedded --build=Release sdk-tag-1.38.4-64bit binaryen-tag-1.38.4-64bit \
+		./emsdk activate --embedded --build=Release sdk-tag-1.38.4-64bit binaryen-tag-1.38.4-64bit ; \
+    touch .complete \
 	)
 
 clean: