diff --git a/ChangeLog b/ChangeLog
index 53ca081dd513a8b29ba2baecfa716ce48acf3070..4d8bc679db985baeb65559707788129c78c1cadc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-03-18  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/nanorc.sample.in - Document the changed whitespace defaults.
+
 2014-03-18  Benno Schulenberg  <bensberg@justemail.net>
 	* src/global.c (shortcut_init) - In the file browser one cannot
 	search for a regular expression, so do not mention it.
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index d8fd60ae78205b537680ffd2415fb8616b8745a0..d5bf3f163758e6e0114016256a2dc4b875f32b56 100644
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -181,7 +181,10 @@
 ## The two single-column characters used to display the first characters
 ## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
 ## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
-# set whitespace ":."
+## The default when in a UTF-8 locale:
+# set whitespace "»·"
+## The default otherwise:
+# set whitespace ">."
 
 ## Detect word boundaries more accurately by treating punctuation
 ## characters as parts of words.