diff --git a/ChangeLog b/ChangeLog
index fb0806228d3e6e862cda6ef18c036999169ead2a..d3ee4b18aa7271906a598b64bacebb4c458f0408 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -102,7 +102,7 @@ CVS code -
 	  beginning characters of tabs and spaces via the rcfile entry
 	  "whitespace".  This is disabled if nanorc support is disabled
 	  or if we're in tiny mode.  Displaying the new characters is
-	  toggled on and off by Meta-P; the default is off. (Mike
+	  toggled on and off by Meta-P; the default is on. (Mike
 	  Frysinger; minor changes and adaptations by DLR)
 	- Add the ability to change the closing punctuation and closing
 	  brackets used to control justification, via the rcfile
diff --git a/src/rcfile.c b/src/rcfile.c
index de5ec4a14429c9d17a445d84b1facb538f642e38..8476eeac4c4fd914d43b58bb42a3832ce70c6fff 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -605,7 +605,8 @@ void parse_rcfile(FILE *rcstream)
 				    rcfile_error(_("Two non-control characters required"));
 				    free(whitespace);
 				    whitespace = NULL;
-				}
+				} else
+				    SET(WHITESPACE_DISPLAY);
 			    } else
 #endif
 #ifndef DISABLE_JUSTIFY