diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 75217a47f7b2..0ba40b04c356 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-29  Jan Beulich  <jbeulich@suse.com>
+
+	* tools/Makefile.am (TOOLS_ZIP): Make writable the copied subtrees
+	asm/ and classes/.
+	* tools/Makefile.in: Re-generate.
+
 2010-06-03  Andrew John Hughes  <ahughes@redhat.com>
 
 	* examples/gnu/classpath/examples/CORBA/NamingService/Demo.java,
diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index 44489c89afd2..f7ad91c90693 100755
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -371,6 +371,7 @@ endif
 ## BEGIN GCJ LOCAL
 	cp -pR $(srcdir)/asm .
 	cp -pR $(srcdir)/classes .
+	find asm classes -type d -exec chmod u+w \{\} \;
 	if [ -d asm/.svn ]; then \
 	  find asm classes -depth -type d -name .svn -exec rm -rf \{\} \;; \
 	fi
diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in
index adb8c09b7d6d..d82fac6d9ae2 100644
--- a/libjava/classpath/tools/Makefile.in
+++ b/libjava/classpath/tools/Makefile.in
@@ -1425,6 +1425,7 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES)
 	done
 	cp -pR $(srcdir)/asm .
 	cp -pR $(srcdir)/classes .
+	find asm classes -type d -exec chmod u+w \{\} \;
 	if [ -d asm/.svn ]; then \
 	  find asm classes -depth -type d -name .svn -exec rm -rf \{\} \;; \
 	fi