diff --git a/ChangeLog b/ChangeLog
index 1cbd20fbddf9dd3333b351528a06e5c0838dedb8..2ccb2b47f92fbc3f7e43895c8a8ea8b49e356986 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,8 @@ CVS code -
 	  curses.h, which breaks compilation there.  Changes to
 	  do_page_up(), do_page_down(), do_up(), do_down(), nano.h, and
 	  edit_scroll(). (DLR, found by Daniel Richard G.)
+	- Rename the DISABLE_ROOTWRAP #define to DISABLE_ROOTWRAPPING.
+	  (DLR)
 - browser.c:
   do_browser()
 	- Refactor the mouse support, modeling it after do_mouse() for
diff --git a/configure.ac b/configure.ac
index a692f797b5055fb7e99ec464148056b4f8292b8f..972f064e8e1ec09ff64d1ab807f364d85038542b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ fi])
 AC_ARG_ENABLE(wrapping-as-root,
 [  --disable-wrapping-as-root  Disable wrapping of text as root by default],
 [if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_ROOTWRAP, 1, [Define this to disable wrapping as root by default.])
+    AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable wrapping as root by default.])
 fi])
 
 AC_ARG_ENABLE(color,
diff --git a/src/nano.c b/src/nano.c
index 8b21092a77169c9abcbfde77702ce3ecc33efa2b..0b4b0cfe3ac222c55c2c8c99cfa9c436ed0f59aa 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -872,7 +872,7 @@ void version(void)
 #ifdef DISABLE_WRAPPING
     printf(" --disable-wrapping");
 #endif
-#ifdef DISABLE_ROOTWRAP
+#ifdef DISABLE_ROOTWRAPPING
     printf(" --disable-wrapping-as-root");
 #endif
 #ifdef ENABLE_COLOR
@@ -1742,7 +1742,7 @@ int main(int argc, char **argv)
     textdomain(PACKAGE);
 #endif
 
-#if !defined(ENABLE_NANORC) && defined(DISABLE_ROOTWRAP)
+#if !defined(ENABLE_NANORC) && defined(DISABLE_ROOTWRAPPING)
     /* If we don't have rcfile support, --disable-wrapping-as-root is
      * used, and we're root, turn wrapping off. */
     if (geteuid() == NANO_ROOT_UID)
@@ -2007,7 +2007,7 @@ int main(int argc, char **argv)
 	    tabsize = tabsize_cpy;
 	flags |= flags_cpy;
     }
-#ifdef DISABLE_ROOTWRAP
+#ifdef DISABLE_ROOTWRAPPING
     /* If we don't have any rcfiles, --disable-wrapping-as-root is used,
      * and we're root, turn wrapping off. */
     else if (geteuid() == NANO_ROOT_UID)
diff --git a/src/rcfile.c b/src/rcfile.c
index 002f23f1e5ac63e28cda172d027bb847178c52aa..807dce254a3379ceaf2439140613e621224ee5e5 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -882,7 +882,7 @@ void do_rcfile(void)
 #endif
 		);
 
-#ifdef DISABLE_ROOTWRAP
+#ifdef DISABLE_ROOTWRAPPING
     /* We've already read SYSCONFDIR/nanorc, if it's there.  If we're
      * root, and --disable-wrapping-as-root is used, turn wrapping off
      * now. */