diff --git a/lib/Makefile.mingw b/lib/Makefile.mingw
index 6a1c5bcbf7..b23fb80094 100644
--- a/lib/Makefile.mingw
+++ b/lib/Makefile.mingw
@@ -51,11 +51,37 @@ LIB_OBJ = util.o win_util.o app_ipc.o diagnostics.o diagnostics_win.o filesys.o
 	hostinfo.o md5.o md5_file.o mem_usage.o mfile.o miofile.o procinfo_win.o procinfo.o proc_control.o parse.o prefs.o \
 	proxy_info.o str_util.o shmem.o base64.o stackwalker_win.o url.o coproc.o
 
-ZIP_OBJ = boinc_zip.o z_win32.o win32zip.o zipup.o zipfile.o zip.o z_globals.o z_fileio.o \
-	z_util.o trees.o deflate.o zipinfo.o win32.o unzip.o unshrink.o unreduce.o ttyio.o \
-	process.o match.o list.o inflate.o globals.o fileio.o extract.o explode.o envargs.o \
-	crctab.o crc32.o apihelp.o api.o
-
+ZIP_OBJ = boinc_zip.o \
+	api.o \
+	apihelp.o \
+	crc32.o \
+	explode.o \
+	extract.o \
+	fileio.o \
+	globals.o \
+	inflate.o \
+	list.o \
+	match.o \
+	nt.o \
+	process.o \
+	ttyio.o \
+	unreduce.o \
+	unshrink.o \
+	unzip.o \
+	win32.o \
+	zipinfo.o \
+	deflate.o \
+	trees.o \
+	util.o \
+	win32_boinc.o \
+	win32i64.o \
+	win32zip.o \
+	z_fileio.o \
+	z_globals.o \
+	z_nt.o \
+	zip.o \
+	zipfile.o \
+	zipup.o
 
 # libraries to build
 API_BIN = libboinc_api.a
@@ -90,7 +116,7 @@ CCXXFLAGS = $(INCS) $(DEBUG) --include $(BOINC_SRC)/version.h -DEINSTEINATHOME_C
 	-DNODB -D_CONSOLE -fexceptions $(OPTFLAGS) $(NOCYGWIN)
 
 # flags for compiling boinc_zip
-ZIP_FLAGS = -DWIN32 -D_LIB -D_MBCS -DNO_MKTEMP $(INCS) -O2 -DDLL $(NOCYGWIN)
+ZIP_FLAGS = -DWIN32 -D_LIB -D_MBCS -DNO_MKTEMP $(INCS) -O2 -DDLL -DUSE_ZIPMAIN $(NOCYGWIN)
 
 # LDFLAGS = -lwinmm 
 
@@ -104,6 +130,7 @@ all: $(BIN) $(API_BIN)
 all-la: $(BIN) $(API_LIB)
 
 # zip target
+.PHONY: boinc_zip
 boinc_zip: $(ZIP_BIN)
 
 # set to the target tools when cross-compiling