diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 2fdac3e080180d9325e7cd91d1de738c0e14b041..28ab3b1ca9a3982dddb942912d37cf3ad4200d4b 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -17,7 +17,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANO 1 "version 2.5.3" "February 2016"
+.TH NANO 1 "version 2.6.0" "June 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 93183f59ba87b333fd3dd8b8d0ec717cd374bb4b..40e3a645a7a96848a66b4965b19ff3e3f56b32ca 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -17,7 +17,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH NANORC 5 "version 2.5.3" "February 2016"
+.TH NANORC 5 "version 2.6.0" "June 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 28f2abb3eecf863ff0aaa67089615c6d4d7e02ea..8457bc3650752547b0241b55043ca5ca206bf24e 100644
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -16,7 +16,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.TH RNANO 1 "version 2.5.3" "February 2016"
+.TH RNANO 1 "version 2.6.0" "June 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 58c52d83be834021d1fc7237ddabf31c979e9386..fb13582028e28a51333298003c7015076af20cfb 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -5,9 +5,9 @@
 @c %**end of header
 
 @smallbook
-@set EDITION 0.3
-@set VERSION 2.5.2
-@set UPDATED February 2016
+@set EDITION 0.4
+@set VERSION 2.6.0
+@set UPDATED June 2016
 
 @dircategory Editors
 @direntry
@@ -21,13 +21,12 @@
 @titlepage
 @title @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 2.5.2
+@subtitle version 2.6.0
 
 @author Chris Allegretta
 @page
 
-This manual documents @code{nano}, a small and friendly text
-editor.
+This manual documents @code{nano}, a small and friendly text editor.
 
 This manual is part of the @code{nano} distribution.@*
 @sp 4