diff --git a/ChangeLog b/ChangeLog
index 29b3267d5b8a5d69fbc4a1363205b73e24c66b37..d37083967f6b7b2827f4a54e2f065123addcac95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 	* src/proto.h, src/nano.c: Fix compilation with --enable-tiny plus
 	--enable-nanorc.
 	* src/rcfile.c (parse_binding): Fix the rebinding of toggles.
+	* doc/man/{nano.1,rnano.1,nanorc.5}, doc/texinfo/nano.texi: Update
+	years and version numbers in the docs in anticipation of a release.
 
 2015-03-07  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/man/nanorc.5, doc/texinfo/nano.texi: Add a note about the
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index d4746f190e1f98f9766f8ec4e4842dd15eb57202..3cd1483db3593836bf13185e3139224d1345495a 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.3.7" "August 2014"
+.TH NANO 1 "version 2.4.0" "March 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index c9a66c8c6d45a18b12e5237e5e1961d384523dd7..d0b6f6b50166f3d843d13a902dbcfe0c84e2cd17 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -2,7 +2,7 @@
 .\" $Id$
 .\"
 .\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-.\" 2013, 2014 Free Software Foundation, Inc.
+.\" 2013, 2014, 2015 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -20,7 +20,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.3.5" "June 2014"
+.TH NANORC 5 "version 2.4.0" "March 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 497642018ab3c7be2c664adbbcb42af4be4a30f0..69014073eb5155d31aeadef5ba480474a5af0c0f 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.3.7" "August 2014"
+.TH RNANO 1 "version 2.4.0" "March 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 46330fdc16ea5f37d7a39cc71d8fdb57339d2025..b77feb1410efd86e4ebc2c1565a34e3ec7e86881 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -8,8 +8,8 @@
 @c Run 'makeinfo' rather than 'texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.3
-@set VERSION 2.3.7
-@set UPDATED August 2014
+@set VERSION 2.4.0
+@set UPDATED March 2015
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 2.3.7
+@subtitle version 2.4.0
 
 @author Chris Allegretta
 @page
@@ -34,7 +34,7 @@ editor.
 This manual is part of the GNU @code{nano} distribution.@*
 @sp 4
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2009, 2014 Free Software Foundation, Inc.
+2009, 2014, 2015 Free Software Foundation, Inc.
 
 This document is dual-licensed.  You may distribute and/or modify it
 under the terms of either of the following licenses: