diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9025a3d1a1d..3beb48cbc62 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 1999-04-12  Tom Tromey  <tromey@cygnus.com>
 
+	* Makefile.in: Rebuilt.
+	* Makefile.am (libgcj.zip): Put `gnu' classes into zip file.
+
 	* java/lang/natSystem.cc (SystemClass): New define.
 	(init_properties): Synchronize.
 
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index eed9d2ac600..615ebd1512a 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -114,7 +114,7 @@ libgcj.zip: $(java_source_files)
 	    $(subst $(srcdir)/,,$?)
 	-@rm -f libgcj.zip
 ## Note that we explicitly want to include directory information.
-	$(ZIP) -r libgcj java -n .class -i '*.class' -i '*/'
+	$(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/'
 
 MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files)
 CLEANFILES = libgcj.zip $(class_files)
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 0d3993ecf24..cd6da4ce4ad 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1179,7 +1179,7 @@ libgcj.zip: $(java_source_files)
 	  $$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \
 	    $(subst $(srcdir)/,,$?)
 	-@rm -f libgcj.zip
-	$(ZIP) -r libgcj java -n .class -i '*.class' -i '*/'
+	$(ZIP) -r libgcj java gnu -n .class -i '*.class' -i '*/'
 
 .class.o:
 	CLASSPATH=$(here) $(CC) -fassume-compiled $(JC1FLAGS) -c -o $@ $<