diff --git a/ChangeLog b/ChangeLog
index 6da178a0f51753ce6628655a40889259938fb1d9..96faecd396b7cea04be881a11453962da2419f24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 	and remove two unneeded ones.  This greatly speeds up nano when doing
 	a Replace All with *lots* of occurrences.
 	* src/{color,global,nano,text,utils}.c:  Normalize some whitespace.
+	* src/global.c (strtosc): The linter is only available when colour is.
 
 2015-03-25  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/syntax/debian.nanorc: Slightly widen and relax the header regex.
@@ -18,7 +19,7 @@
 	formatter allows no interaction it needs no associated menu.
 	* src/text.c (do_formatter): Remove unneeded statement -- nothing
 	has changed the value of 'currmenu'.
-	* src/global.c (strtomenu), doc/man/nanorc.5: Allow rebinding the
+	* src/global.c (strtosc), doc/man/nanorc.5: Allow rebinding the
 	linter when nano was configured with --disable-speller.
 
 2015-03-23  Benno Schulenberg  <bensberg@justemail.net>
diff --git a/src/global.c b/src/global.c
index 439ae7bb17151622410c1efb84b1b8df65a521a5..4643af2add38eb26cb01c951f27b097676794e59 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1311,8 +1311,10 @@ sc *strtosc(char *input)
 	     !strcasecmp(input, "speller"))
 	s->scfunc = do_spell;
 #endif
+#ifndef DISABLE_COLOR
     else if (!strcasecmp(input, "linter"))
 	s->scfunc = do_linter;
+#endif
     else if (!strcasecmp(input, "curpos") ||
 	     !strcasecmp(input, "cursorpos"))
 	s->scfunc = do_cursorpos_void;