diff --git a/ChangeLog b/ChangeLog
index 601adb208c79743512259e02dc996c8a1b07f917..3d6be2501e065e28fa31a8842257527fe36c06a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	#ifdef ENABLE_COLOR to #ifndef DISABLE_COLOR.⏎
 	* src/nano.h: Comment tweaks.
 	* configure.ac: Move the enabling stuff to after the disablers.
+	* configure.ac: Add submissive colour disabling to --enable-tiny.
 
 2014-04-03  Benno Schulenberg  <bensberg@justemail.net>
 	* configure.ac: Remove unused '*_support' variables.
diff --git a/configure.ac b/configure.ac
index fb45cd51c13b1df65d3dd987a84a34b3d17b9399..33259a3a2f79645fb6a081b31d89bcd51af053bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,10 @@ AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size]))
 if test "x$enable_tiny" = xyes; then
     AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.])
     AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
+    if test "x$enable_color" != xyes; then
+	AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.])
+	color_support=no
+    fi
     if test "x$enable_extra" = xno; then
 	AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
     fi