diff --git a/ChangeLog b/ChangeLog
index 72f253ce55a931e0ac475afc5db9726dd4fda558..2cc74fedf6a995249d0743c28fb6210c18df6632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ CVS code -
 	- Minor cosmetic code cleanups. (DLR)
 - configure.ac:
 	- Added pt_BR to ALL_LINGUAS (Jordi).
+	- Changed --enable-color warning to be slightly less severe.
 - files.c:
   open_file()
 	- String change: "File "x" is a directory" -> ""x" is a
diff --git a/configure.ac b/configure.ac
index 327a44d620e37533acbe64db33f2a0448a970830..15186eee6130067684b8a851da4c8f082083fc59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,8 +77,8 @@ AC_ARG_ENABLE(color,
     AC_MSG_WARN([
 
 ***********************************************************************
-*** WARNING: Color support is currently BROKEN.  Don't expect it to ***
-*** work AT ALL until more is implemented.                          ***
+*** WARNING: Color support is far from perfect, but functional.     ***
+*** Be careful with syntax in your .nanorc or nano may malfunction. ***
 ***********************************************************************
 ])
 fi])