diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 69d875432136..fa4171ba5bc4 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Andreas Tobler  <andreast@fgznet.ch>
+
+	* tools/Makefile.am (GJDOC_EX): Use find -name pattern -prune -o.
+	* tools/Makefile.in: Regenerate.
+
 2009-12-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* Makefile.in: Regenerate.
diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index dfaaf024d3b6..44bc49fdf292 100755
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -277,12 +277,10 @@ gjdoc_resources = $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjd
 	$(gnu_classpath_tools_gjdoc_jar_XHTML) $(gnu_classpath_tools_gjdoc_jar_XSLS)
 
 if !CREATE_GJDOC
-GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o \
-	-path '*gnu/classpath/tools/doclets' -prune -o \
-	-path '*gnu/classpath/tools/taglets' -prune -o \
-	-path '*com/sun/javadoc' -prune -o \
-	-path '*com/sun/tools/doclets' -prune -o \
-	-path '*com/sun/tools/javadoc' -prune -o
+GJDOC_EX = -name gjdoc -prune -o \
+	-name doclets -prune -o \
+	-name taglets -prune -o \
+	-name javadoc -prune -o
 endif
 
 # The zip files with classes we want to produce.
diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in
index 54e689f5fa92..1258e3289580 100644
--- a/libjava/classpath/tools/Makefile.in
+++ b/libjava/classpath/tools/Makefile.in
@@ -684,12 +684,10 @@ gjdoc_resources = $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjd
 	$(gnu_classpath_tools_gjdoc_jar_RNGS) $(gnu_classpath_tools_gjdoc_jar_TXTS) \
 	$(gnu_classpath_tools_gjdoc_jar_XHTML) $(gnu_classpath_tools_gjdoc_jar_XSLS)
 
-@CREATE_GJDOC_FALSE@GJDOC_EX = -path '*gnu/classpath/tools/gjdoc' -prune -o \
-@CREATE_GJDOC_FALSE@	-path '*gnu/classpath/tools/doclets' -prune -o \
-@CREATE_GJDOC_FALSE@	-path '*gnu/classpath/tools/taglets' -prune -o \
-@CREATE_GJDOC_FALSE@	-path '*com/sun/javadoc' -prune -o \
-@CREATE_GJDOC_FALSE@	-path '*com/sun/tools/doclets' -prune -o \
-@CREATE_GJDOC_FALSE@	-path '*com/sun/tools/javadoc' -prune -o
+@CREATE_GJDOC_FALSE@GJDOC_EX = -name gjdoc -prune -o \
+@CREATE_GJDOC_FALSE@	-name doclets -prune -o \
+@CREATE_GJDOC_FALSE@	-name taglets -prune -o \
+@CREATE_GJDOC_FALSE@	-name javadoc -prune -o
 
 
 # The zip files with classes we want to produce.