diff --git a/checkin_notes b/checkin_notes
index 5e6dba59a6..e39dc6b757 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6837,3 +6837,15 @@ Charlie 15 Nov 2012
             (many files)
         unzip/
             (many files)
+
+David  15 Nov 2012
+    - boinc_zip: fix Unix build
+
+    zip/
+        Makefile.am
+        zip/
+            Makefile.am (add)
+            unix/
+                unix.c -> z_unix.c
+        unzip/
+            Makefile.am (add)
diff --git a/zip/Makefile.am b/zip/Makefile.am
index 5f666b88ae..358fa2a124 100644
--- a/zip/Makefile.am
+++ b/zip/Makefile.am
@@ -14,7 +14,7 @@ endif
 
 libboinc_zip_sources = \
 boinc_zip.cpp \
-./unzip/api.c	\
+./unzip/api.c \
 ./unzip/apihelp.c \
 ./unzip/crc32.c \
 ./unzip/explode.c \
@@ -26,7 +26,7 @@ boinc_zip.cpp \
 ./unzip/match.c \
 ./unzip/process.c \
 ./unzip/ttyio.c \
-./unzip/unix/unix.c 
+./unzip/unix/unix.c \
 ./unzip/unreduce.c \
 ./unzip/unshrink.c \
 ./unzip/unzip.c \
@@ -39,7 +39,7 @@ boinc_zip.cpp \
 ./zip/zip.c \
 ./zip/zipfile.c \
 ./zip/zipup.c \
-./zip/unix/unix.c \
+./zip/unix/z_unix.c
 
 ##noinst_PROGRAMS = test
 if ENABLE_LIBRARIES
@@ -49,7 +49,7 @@ libboinc_zip_la_SOURCES = $(libboinc_zip_sources)
 libboinc_zip_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
 libboinc_zip_la_LIBADD =
 
-# Some OSs may not prefix libraries with lib. 
+# Some OSs may not prefix libraries with lib.
 # For example OS2
 if OS_OS2
 LIBBOINC_ZIP_STATIC=boinc_zip.${LIBEXT}
diff --git a/zip/unzip/Makefile.am b/zip/unzip/Makefile.am
new file mode 100644
index 0000000000..392c2285ce
--- /dev/null
+++ b/zip/unzip/Makefile.am
@@ -0,0 +1,15 @@
+## -*- mode: makefile; tab-width: 4 -*-
+## $Id: Makefile.am 15375 2008-06-08 22:18:52Z davea $
+
+EXTRA_DIST = BUGS	      WHERE	  envargs.c    inflate.c   ttyio.h	 unzvers.h	\
+api.c	  explode.c    inflate.h   unix	 win32				\
+Contents      apihelp.c   extract.c    list.c	   unreduce.c	 zip.h				\
+History.550   consts.h	  file_id.diz  macos	   unshrink.c	 zipgrep.txt			\
+INSTALL       crc32.c	  fileio.c     match.c	   unzip.c	 zipinfo.c			\
+LICENSE       crc_i386.S  funzip.c     process.c   unzip.h	 zipinfo.txt			\
+Makefile.am   crctab.c	  funzip.txt   tables.h    unzip.txt					\
+crypt.c	      gbloffs.c   timezone.c  unzipsfx.txt					\
+README	      crypt.h	  globals.c    timezone.h  unzipstb.c					\
+ToDo	      ebcdic.h	  globals.h    ttyio.c	   unzpriv.h
+
+
diff --git a/zip/zip/Makefile.am b/zip/zip/Makefile.am
new file mode 100644
index 0000000000..f2b7087168
--- /dev/null
+++ b/zip/zip/Makefile.am
@@ -0,0 +1,10 @@
+## -*- mode: makefile; tab-width: 4 -*-
+## $Id: Makefile.am 15375 2008-06-08 22:18:52Z davea $
+
+EXTRA_DIST = deflate.c   tailor.h  z_api.h	  z_crypt.h    z_ttyio.h   ziperr.h    zipup.c 	\
+ebcdic.h    trees.c   z_crc32.c   z_fileio.c   zip.c	   zipfile.c				\
+mktime.c    util.c    z_crctab.c  z_globals.c  zip.h	   zipnote.c				\
+revision.h  z_api.c   z_crypt.c   z_ttyio.c    zipcloak.c  zipsplit.c				\
+BUGS	     CHANGES      README	 macos      TODO	   match.S     unix win32  	\
+INSTALL      WHATSNEW	  LICENSE      WHERE	   MANUAL	   crc_i386.S			
+
diff --git a/zip/zip/unix/unix.c b/zip/zip/unix/z_unix.c
similarity index 100%
rename from zip/zip/unix/unix.c
rename to zip/zip/unix/z_unix.c