diff --git a/Makefile b/Makefile
index ae70979..5a2698c 100644
--- a/Makefile
+++ b/Makefile
@@ -172,9 +172,11 @@ $(BUNDLEDIR):
              --eval '(quit)'
 
 $(BUNDLE): $(BUNDLEDIR)
-	cp bundle/README.md bundle/Makefile $(BUNDLEDIR)
+	cp bundle/README.md $(BUNDLEDIR)
+	sed -e s/%VERSION%/$(VERSION)/ < bundle/Makefile > $(BUNDLEDIR)/Makefile
 	git archive --format=tar --prefix=pgloader-$(VERSION)/ master \
 	     | tar -C $(BUNDLEDIR)/local-projects/ -xf -
+	make QLDIR=$(BUNDLEDIR) clones
 	tar -C build/bundle 		    \
             --exclude bin   		    \
             --exclude test/sqlite           \
diff --git a/bundle/Makefile b/bundle/Makefile
index 6b89536..246438f 100644
--- a/bundle/Makefile
+++ b/bundle/Makefile
@@ -3,7 +3,7 @@
 CL = sbcl
 
 APP_NAME   = pgloader
-VERSION    = 3.3.0.50
+VERSION    = %VERSION%
 
 ifeq ($(OS),Windows_NT)
 EXE           = .exe
@@ -43,7 +43,7 @@ $(BUILDAPP):
              --eval '(buildapp:build-buildapp "$@")'                  \
              --eval '(quit)'
 
-$(PGLOADER): $(BUILDAPP) clones
+$(PGLOADER): $(BUILDAPP)
 	$(BUILDAPP)      --logfile /tmp/pgloader-bundle-build.log     \
                          $(BUILDAPP_OPTS)                             \
                          --sbcl $(CL)                                 \
@@ -58,30 +58,6 @@ $(PGLOADER): $(BUILDAPP) clones
 	# that's ugly, but necessary when building on Windows :(
 	mv $@.tmp $@
 
-#
-# Provide the current versions of some packages, not the Quicklisp one:
-#
-local-projects/qmynd:
-	git clone https://github.com/qitab/qmynd.git $@
-
-local-projects/cl-ixf:
-	git clone https://github.com/dimitri/cl-ixf.git $@
-
-local-projects/cl-db3:
-	git clone https://github.com/dimitri/cl-db3.git $@
-
-local-projects/cl-csv:
-	git clone https://github.com/AccelerationNet/cl-csv.git $@
-
-local-projects/esrap:
-	git clone https://github.com/scymtym/esrap.git $@
-
-clones: local-projects/cl-ixf \
-        local-projects/cl-db3 \
-        local-projects/cl-csv \
-        local-projects/qmynd  \
-        local-projects/esrap ;
-
 test: $(PGLOADER)
 	$(MAKE) PGLOADER=$(realpath $(PGLOADER)) -C $(SRCDIR)/test regress