diff --git a/Makefile.am b/Makefile.am
index e92a7d1cd6..7e250c8912 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = RSAEuro db lib api apps client sched tools test py
+SUBDIRS = RSAEuro db lib api apps client sched tools test py zip unzip
 
 # Putting a directory name recursively copies the entire contents - the
 # dist-hook below gets rid of CVS directories.
diff --git a/Makefile.in b/Makefile.in
index 580e06fe21..2529c92df5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,7 +145,7 @@ target_vendor = @target_vendor@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = RSAEuro db lib api apps client sched tools test py
+SUBDIRS = RSAEuro db lib api apps client sched tools test py zip unzip
 
 
 # Putting a directory name recursively copies the entire contents - the
diff --git a/aclocal.m4 b/aclocal.m4
index 076c280818..d07c7c043d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1104,7 +1104,7 @@ AC_DEFUN([SAH_HEADER_STDCXX],[
 #
 # Revision Log:
 # $Log$
-# Revision 1.81  2004/04/08 08:14:50  davea
+# Revision 1.82  2004/04/09 21:42:45  davea
 # *** empty log message ***
 #
 # Revision 1.1  2003/12/11 18:38:24  korpela
diff --git a/checkin_notes b/checkin_notes
index 806f699ff8..ea27819986 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -11474,3 +11474,13 @@ David  April 8 2004
     
     sched/
         transitioner.C
+
+David  April 9 2004
+    - Added zip/unzip code (from Carl Christensen).
+        This is basically the Info-ZIP code with unused files stripped out,
+        and some minor tweaks to return errors instead of exiting
+
+    zip/
+        * (new)
+    unzip/
+        * (new)