diff --git a/ChangeLog b/ChangeLog
index 42f2ce36f..d5146f349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-28  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* src/sanity/style.test: Make sure grep supports the options put
+	into GREP_OPTIONS.
+
 	* wrap/python/tests/run.in: Define DYLD_LIBRARY_PATH so that
 	Darwin finds non-installed libraries.
 	Report from Akim Demaille.
diff --git a/src/sanity/style.test b/src/sanity/style.test
index 446d7b055..f771c4cb1 100755
--- a/src/sanity/style.test
+++ b/src/sanity/style.test
@@ -15,10 +15,12 @@ diag()
 rm -f failures
 
 # Get some help from GNU grep.
-GREP_OPTIONS='--color=auto -n'
-GREP_COLOR='1;31'
-export GREP_OPTIONS
-export GREP_COLOR
+if (grep --color=auto -n --version)>/dev/null 2>&1; then
+  GREP_OPTIONS='--color=auto -n'
+  GREP_COLOR='1;31'
+  export GREP_OPTIONS
+  export GREP_COLOR
+fi
 
 tmp=incltest.tmp