diff --git a/ChangeLog b/ChangeLog
index e202cb01..d27f29a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-12-05  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c: Fix compilation with --enable-tiny --enable-justify.
+	* doc/man/{nano.1,rnano.1,nanorc.5}, doc/texinfo/nano.texi:
+	Update date and version number to match the upcoming release.
 
 2015-12-04  Benno Schulenberg  <bensberg@justemail.net>
 	* src/proto.h: Avoid a compilation warning.
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 320942b5..49f2dff5 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.4.3" "August 2015"
+.TH NANO 1 "version 2.5.0" "December 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 67ce5971..2d029141 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.4.3" "August 2015"
+.TH NANORC 5 "version 2.5.0" "December 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 69014073..40674a71 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.4.0" "March 2015"
+.TH RNANO 1 "version 2.5.0" "December 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 1d232337..646575b9 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -6,8 +6,8 @@
 
 @smallbook
 @set EDITION 0.3
-@set VERSION 2.4.3
-@set UPDATED August 2015
+@set VERSION 2.5.0
+@set UPDATED December 2015
 
 @dircategory Editors
 @direntry
@@ -21,7 +21,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 2.4.3
+@subtitle version 2.5.0
 
 @author Chris Allegretta
 @page