diff --git a/ChangeLog b/ChangeLog
index 626ce0b1..78e59fb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -235,6 +235,11 @@ CVS code -
 	  when the MORE_SPACE flag is set. (DLR)
 - configure.ac:
 	- Clarify description of --disable-speller. (DLR)
+	- Disable wrapping entirely when --enable-tiny is used, as it
+	  matches the FAQ, it makes nano even smaller, and it eliminates
+	  the need for --disable-wrapping-as-root in that case (in which
+	  it's impossible to turn wrapping back on without nanorc
+	  support). (DLR)
 - README.CVS:
 	- Mention that the minimum required version of texinfo is 4.0,
 	  since that's the first version that supports generating HTML.
diff --git a/configure.ac b/configure.ac
index cd5b28a1..023807e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,6 +95,7 @@ AC_ARG_ENABLE(tiny,
     AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).])
     AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
     AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion code Chris worked so hard on!])
+    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable any and all text wrapping.])
 fi])
 
 AC_ARG_ENABLE(browser,