diff --git a/Makefile.am b/Makefile.am
index b90843bdaa..2c70a9fb11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ include Makefile.incl
 ACLOCAL_AMFLAGS = -I m4
 
 if ENABLE_LIBRARIES
-   API_SUBDIRS = api lib zip
+   API_SUBDIRS = api lib
 endif
 
 if ENABLE_SERVER
diff --git a/checkin_notes b/checkin_notes
index 307c8ff700..7cf711471a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6356,3 +6356,11 @@ David  16 July 2009
     client/
         rr_sim.cpp
         work_fetch.cpp,h
+
+Rom    17 July 2009
+    - Remove boinc_zip(InfoZip) from the main BOINC tree
+    - Remove boinc_zip from the build system
+    
+    /
+        configure.ac
+        Makefile.am
diff --git a/configure.ac b/configure.ac
index bd95088984..e42bcf01b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -855,18 +855,18 @@ AC_CONFIG_FILES([
                  clientgui/res/Makefile
                  client/Makefile
                  client/win/boinc_path_config.py:py/boinc_path_config.py.in
-		 client/scripts/Makefile
-		 client/scripts/boinc-client
+                 client/scripts/Makefile
+                 client/scripts/boinc-client
                  db/Makefile
                  doc/Makefile
                  doc/manpages/Makefile
                  lib/Makefile
-		 locale/Makefile
+                 locale/Makefile
                  Makefile
                  py/Boinc/version.py
                  py/Makefile
                  py/boinc_path_config.py:py/boinc_path_config.py.in
-		 py/setup.py
+                 py/setup.py
                  sched/boinc_path_config.py:py/boinc_path_config.py.in
                  sched/Makefile
                  packages/generic/sea/Makefile
@@ -888,9 +888,6 @@ AC_CONFIG_FILES([
                  test/version.inc
                  tools/boinc_path_config.py:py/boinc_path_config.py.in
                  tools/Makefile
-                 zip/Makefile
-                 zip/zip/Makefile
-                 zip/unzip/Makefile
                  m4/Makefile
 		])