diff --git a/ChangeLog b/ChangeLog
index 5df3e182ede19c82f9500640d8bc2891066e96c7..98aaa3afae87a4b216fa48ca1d0d68edea77f584 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 beafe4900b27f2d835f59fa3b7f39228512f63e8..911f2b91c49f59ca29a79d995be6e9b969876134 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