diff --git a/ChangeLog b/ChangeLog
index 4d8bc679db985baeb65559707788129c78c1cadc..8d0511d5e50b1867d1d73a378f057f192eda1f7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-2014-03-18  Benno Schulenberg  <bensberg@justemail.net>
+2014-03-19  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/nanorc.sample.in - Document the changed whitespace defaults.
+	* src/global.c, doc/man/nanorc.5 - Allow softwrap to be rebound.
 
 2014-03-18  Benno Schulenberg  <bensberg@justemail.net>
 	* src/global.c (shortcut_init) - In the file browser one cannot
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 1c7a4091bffb90aca8e6628889423016ceaf50bc..582aece21a16ae6e03d43901d4b83bd3f6740957 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -524,6 +524,9 @@ position to the end of the line.
 .B nowrap
 Toggle whether long lines will be wrapped to the next line.
 .TP
+.B softwrap
+Toggle whether long lines will be displayed over multiple screen lines.
+.TP
 .B suspendenable
 Toggle whether the suspend sequence (normally ^Z) will suspend the editor window.
 .TP
diff --git a/src/global.c b/src/global.c
index 0e7e79cf64151d0e5b6a27f3b3608020b582e850..21bc27eb6bb1d11a8b4ce559b2eb27cd66fb3fc8 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1484,8 +1484,7 @@ sc *strtosc(int menu, char *input)
     } else if (!strcasecmp(input, "nexthistory")) {
 	s->scfunc =  get_history_newer_void;
 	s->execute = FALSE;
-    } else if (!strcasecmp(input, "nohelp") ||
-	       !strcasecmp(input, "nohelp")) {
+    } else if (!strcasecmp(input, "nohelp")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = NO_HELP;
@@ -1525,6 +1524,10 @@ sc *strtosc(int menu, char *input)
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = NO_WRAP;
+    } else if (!strcasecmp(input, "softwrap")) {
+	s->scfunc =  do_toggle_void;
+	s->execute = FALSE;
+	s->toggle = SOFTWRAP;
     } else if (!strcasecmp(input, "tabstospaces")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;