diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aac072bcb718528a59e8ac419cdfd6684af207d7..bdb0a89adab1294b949249e428a3b428930f997b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* Makefile.am (src.zip): Update src.zip file search to look in
+	classpath directory.
+	* Makefile.in: Regenerate.
+
 2006-02-03  Robert Schuster  <robertschuster@fsfe.org>
 
 	* link.cc:
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 9ec3a549ccc4f3edf16c55738d7c1313d6d716b0..4f663a0c9c5e9970909a940cde35610fa17faa29 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -864,20 +864,40 @@ gnu/gcj/xlib/natXUnmapEvent.cc
 src.zip:
 	-rm -f src.zip
 	here=`pwd`; \
-	( ( cd $(srcdir); \
+	( \
+	  ( cd $(srcdir)/classpath; \
 	  find java gnu javax org -name '*.java' -print | \
 	  while read file; do \
 ## Ugly code to avoid "echo -C".  Must separate each entry by a newline
 ## Gross but easy.
 	    echo "x-C" | sed -e 's/^.//'; \
-	    echo $(srcdir); \
+	    echo $(srcdir)/classpath; \
 	    echo $$file; \
 	  done ); \
 ## Now the build tree.
-	  find gnu java -name '*.java' -print) | \
+	  ( cd classpath; \
+	    find gnu java -name '*.java' -print | \
+	    while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo `pwd`; \
+	    echo $$file; \
+	  done ); \
+	) | \
 ## Many of the above circumlocutions are because ZIP will most likely
 ## be a relative path to fastjar.
 	$(ZIP) -cfM@ $$here/src.zip
+## Override GNU Classpath sources with libgcj replacements.
+	here=`pwd`; \
+	( \
+	  ( cd $(srcdir); \
+	  find gnu java -name '*.java' -print | \
+	  while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo $(srcdir); \
+	    echo $$file; \
+	  done ); \
+	) | \
+	$(ZIP) -ufM@ $$here/src.zip
 
 ## We use a variable for this in case the user wants to override it.
 sourcesdir = $(jardir)
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 118b49251816444e8b8cdae56da4db26e0f317ef..af11934ec76521ee6d5463ada3024982e6f88b14 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -9465,15 +9465,34 @@ write-entries-to-file-check:
 src.zip:
 	-rm -f src.zip
 	here=`pwd`; \
-	( ( cd $(srcdir); \
+	( \
+	  ( cd $(srcdir)/classpath; \
 	  find java gnu javax org -name '*.java' -print | \
 	  while read file; do \
 	    echo "x-C" | sed -e 's/^.//'; \
-	    echo $(srcdir); \
+	    echo $(srcdir)/classpath; \
 	    echo $$file; \
 	  done ); \
-	  find gnu java -name '*.java' -print) | \
+	  ( cd classpath; \
+	    find gnu java -name '*.java' -print | \
+	    while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo `pwd`; \
+	    echo $$file; \
+	  done ); \
+	) | \
 	$(ZIP) -cfM@ $$here/src.zip
+	here=`pwd`; \
+	( \
+	  ( cd $(srcdir); \
+	  find gnu java -name '*.java' -print | \
+	  while read file; do \
+	    echo "x-C" | sed -e 's/^.//'; \
+	    echo $(srcdir); \
+	    echo $$file; \
+	  done ); \
+	) | \
+	$(ZIP) -ufM@ $$here/src.zip
 
 install-src.zip: src.zip
 	$(INSTALL_DATA) src.zip $(DESTDIR)$(sourcesdir)/src-$(gcc_version).zip