diff --git a/mak/MANIFEST b/mak/MANIFEST
index bf1d5928a05..c59e31c38c5 100644
--- a/mak/MANIFEST
+++ b/mak/MANIFEST
@@ -291,4 +291,37 @@ MANIFEST=\
 	src\rt\typeinfo\ti_void.d \
 	src\rt\typeinfo\ti_wchar.d \
 	\
-	src\etc\linux\memoryerror.d
+	src\etc\linux\memoryerror.d \
+	\
+	test\coverage\Makefile \
+	test\coverage\src-basic.lst.exp \
+	test\coverage\src-merge.lst.exp \
+	test\coverage\src-merge_true.lst.exp \
+	test\coverage\src\basic.d \
+	test\coverage\src\merge.d \
+	test\coverage\src\merge_true.d \
+	test\exceptions\Makefile \
+	test\exceptions\src\stderr_msg.d \
+	test\exceptions\src\unittest_assert.d \
+	test\init_fini\Makefile \
+	test\init_fini\src\runtime_args.d \
+	test\init_fini\src\thread_join.d \
+	test\shared\Makefile \
+	test\shared\src\finalize.d \
+	test\shared\src\host.c \
+	test\shared\src\lib.d \
+	test\shared\src\lib_13414.d \
+	test\shared\src\liblinkdep.d \
+	test\shared\src\libloaddep.d \
+	test\shared\src\link.d \
+	test\shared\src\linkD.c \
+	test\shared\src\linkDR.c \
+	test\shared\src\link_linkdep.d \
+	test\shared\src\link_loaddep.d \
+	test\shared\src\load.d \
+	test\shared\src\loadDR.c \
+	test\shared\src\load_13414.d \
+	test\shared\src\load_linkdep.d \
+	test\shared\src\load_loaddep.d \
+	test\shared\src\plugin.d
+
diff --git a/posix.mak b/posix.mak
index 762aa3756d0..12da8e1104e 100644
--- a/posix.mak
+++ b/posix.mak
@@ -207,7 +207,7 @@ test/%/.run: test/%/Makefile
 		DRUNTIME=$(abspath $(DRUNTIME)) DRUNTIMESO=$(abspath $(DRUNTIMESO)) QUIET=$(QUIET) LINKDL=$(LINKDL)
 
 #################### test for undesired white spaces ##########################
-CWS_MAKEFILES = $(filter mak/% %.mak,$(MANIFEST))
+CWS_MAKEFILES = $(filter mak/% %.mak %/Makefile,$(MANIFEST))
 NOT_MAKEFILES = $(filter-out $(CWS_MAKEFILES),$(MANIFEST))
 GREP = grep
 
@@ -222,9 +222,13 @@ detab:
 	detab $(MANIFEST)
 	tolf $(MANIFEST)
 
+
+gitzip:
+	git archive --format=zip HEAD > druntime.zip
+
 zip: druntime.zip
 
-druntime.zip: $(MANIFEST) $(IMPORTS)
+druntime.zip: $(MANIFEST)
 	rm -rf $@
 	zip $@ $^
 
diff --git a/win32.mak b/win32.mak
index b19963395aa..7fa65e92826 100644
--- a/win32.mak
+++ b/win32.mak
@@ -655,9 +655,9 @@ unittest : $(SRCS) $(DRUNTIME)
 
 zip: druntime.zip
 
-druntime.zip: import
+druntime.zip:
 	del druntime.zip
-	zip32 -T -ur druntime $(MANIFEST) $(IMPDIR) src\rt\minit.obj
+	zip32 -T -ur druntime $(MANIFEST) src\rt\minit.obj
 
 install: druntime.zip
 	unzip -o druntime.zip -d \dmd2\src\druntime
diff --git a/win64.mak b/win64.mak
index e324a161976..2c951a2a990 100644
--- a/win64.mak
+++ b/win64.mak
@@ -681,7 +681,7 @@ zip: druntime.zip
 
 druntime.zip: import
 	del druntime.zip
-	zip32 -T -ur druntime $(MANIFEST) $(IMPDIR) src\rt\minit.obj
+	zip32 -T -ur druntime $(MANIFEST) src\rt\minit.obj
 
 install: druntime.zip
 	unzip -o druntime.zip -d \dmd2\src\druntime