diff --git a/ChangeLog b/ChangeLog
index 5df3e182..98aaa3af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-07-21  Jordi Mallach  <jordi@gnu.org>
+	* doc/nanorc.sample.in: Remove ‘undo’ section which is now obsolete.
+
 GNU nano 2.3.6 - 2014.07.17
 2014-07-16  Jordi Mallach  <jordi@gnu.org>
 	* doc/man/rnano.1: Additional printing formatting improvement from
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index beafe490..911f2b91 100644
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -165,10 +165,6 @@
 ## Save automatically on exit; don't prompt.
 # set tempfile
 
-## Enable the new (EXPERIMENTAL) generic undo code, not just for line
-## cuts.
-# set undo
-
 ## Disallow file modification.  Why would you want this in an rcfile? ;)
 # set view