diff --git a/ChangeLog b/ChangeLog
index 6e5b2018..5d7a1dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	tests: skip -Wall -Werror with Tru64 cc in cwrapper test.
+	* tests/cwrapper.at (cwrapper for uninstalled executables):
+	Use a link test rather than a compile test to flesh out unknown
+	compiler flags starting with -W; Tru64/OSF1 cc will happily
+	accept `-Wall -Werror' as indication to pass flags on to
+	subprocesses.
+
 	tests: avoid getopt-m4sh failures when autom4te is not available.
 	* tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP):
 	Check $M4SH --version, skip on failure.
diff --git a/tests/cwrapper.at b/tests/cwrapper.at
index babd91e1..248c0c0a 100644
--- a/tests/cwrapper.at
+++ b/tests/cwrapper.at
@@ -1,6 +1,6 @@
 # cwrapper.at -- test cwrapper compliance with standards -*- Autotest -*-
 
-#   Copyright (C) 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #   Written by Charles Wilson, 2009
 #
 #   This file is part of GNU Libtool.
@@ -61,10 +61,10 @@ for restrictive_flags in '-Wall -Werror' '-std=c89 -Wall -Werror' '-std=c99 -Wal
   chmod +x libtool
   LIBTOOL=./libtool
 
-  # make sure $restrictive_flags do not cause a failure
+  # Make sure $restrictive_flags do not cause a failure
   # themselves (e.g. because a non-gcc compiler doesn't
-  # understand them)
-  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c trivial.c || continue
+  # understand them).  Tru64 cc only fails when linking.
+  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS trivial.c || continue
 
   AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba.c],
            [], [ignore], [ignore])
@@ -111,10 +111,10 @@ for debugwrapper_flags in '-DLT_DEBUGWRAPPER'; do
     < "$orig_LIBTOOL" > ./libtool
   LIBTOOL=./libtool
 
-  # make sure $debugwrapper_flags do not cause a failure
+  # Make sure $debugwrapper_flags do not cause a failure
   # themselves (e.g. because a non-gcc compiler doesn't
-  # understand them)
-  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c trivial.c || continue
+  # understand them).  Tru64 cc only fails when linking.
+  $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS trivial.c || continue
 
   AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c liba.c],
            [], [ignore], [ignore])