diff --git a/ChangeLog b/ChangeLog
index dc9be08b..276b5b69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 	do_statusbar_output): Do the copying from input to output just once.
 	* src/prompt.c (do_statusbar_output): Rename and condense some stuff,
 	and correct the main comment: filtering means allow_cntrls==FALSE.
+	* README, TODO, doc/man/{nano.1,rnano.1,nanorc.5}: Say that 2.5.x
+	is a "rolling" release, lock files are done, and prepare for 2.5.3.
 
 2016-02-13  Benno Schulenberg  <bensberg@justemail.net>
 	* src/browser.c (do_browser, browser_refresh): Rebuild the file list
diff --git a/README b/README
index a8a007ac..b304ada7 100644
--- a/README
+++ b/README
@@ -68,6 +68,5 @@ Mailing Lists and Bug Reports
 
 Current Status
 
-	GNU nano has reached its fifth stable milestone, 2.4.x.
-	Development of new features will continue in the 2.5.x branch,
-	while 2.4.x versions are dedicated to bug-fixing and polishing.
+	GNU nano has reached its sixth milestone, 2.5.x.  This is now a
+	"rolling" release: bug fixing and development go hand in hand.
diff --git a/TODO b/TODO
index cb3dbbbb..a9060330 100644
--- a/TODO
+++ b/TODO
@@ -2,8 +2,6 @@ TODO file (? means the feature may be implemented, but not definitely)
 ------------------------------------------------------------------------
 
 For the future (no targeted version, catch-all)
-- Compatibility with vi/emacs status files so we can let other editors 
-  know we're in a file?
 - FriBidi support?
 - Port to DJGPP?
 - Make matching bracket searches sophisticated enough to skip over
@@ -42,6 +40,8 @@ For version 2.4:
   wherever we were before we resized, as Pico does. [DONE]
 - Allow even better file-type detection than we have currently, e.g.
   through libmagic. [DONE]
+- Compatibility with vim status files to let other editors know we're
+  in a file. [DONE]
 
 For version 2.2:
 - Rebindable keys? [DONE]
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 88ed4709..1df33c09 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -20,7 +20,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.5.2" "February 2016"
+.TH NANO 1 "version 2.5.3" "February 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 5d9295ef..a231b0c8 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -20,7 +20,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.5.2" "February 2016"
+.TH NANORC 5 "version 2.5.3" "February 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 39e63571..904442b0 100644
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -19,7 +19,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 2.5.2" "February 2016"
+.TH RNANO 1 "version 2.5.3" "February 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME