diff --git a/IMPROVEMENTS b/IMPROVEMENTS
index 7de047b0db5f114b80fd1e03f6e040406ded874b..d200172d9c7be6d2000012279fcf06918b58531b 100644
--- a/IMPROVEMENTS
+++ b/IMPROVEMENTS
@@ -2,6 +2,7 @@ Improvements in GNU nano
 ========================
 
 Since 2.6.0:
+  - Shift plus the cursor keys can be used for selecting text.
   - Ctrl+Arrow should now work also on a Linux virtual console.
   - Ctrl+Up and Ctrl+Down jump to previous or next block of text.
   - Feedback during Unicode Input (M-V followed by six digits).
diff --git a/NEWS b/NEWS
index 384b727fd0b5b6aa06e63efdbe0d956f5e1b7a19..3ba34bfc0592e2b6d966a3a4c40477d696bcaa8f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+2016.09.01 - GNU nano 2.7.0 "Suni" adds a new feature: allowing text to be
+		selected by holding Shift together with the cursor keys.
+		Besides that, nano now works also when run in very tiny
+		terminals (down to one line, one column), and improves
+		the handling of the prompt in cramped spaces.  Not much,
+		but it's time to get it out there.
+
+
 2016.08.10 - nano 2.6.3 "Marika" makes the Ctrl+Arrow keys work also on
 		a Linux virtual console, takes as verbatim only the very
 		first keystroke after M-V, removes any lock files that it
diff --git a/configure.ac b/configure.ac
index 336e2fac733317c8a0c9c603e26a776e227bfb94..e024a1e6b68b13b7c6992b5425b5244dc94016cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/.
 
-AC_INIT([GNU nano], [2.6.3], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.7.0], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 9b6450ea70caeb646a87c44b407e86eab8dcced5..b63f73c102c7e188bcf71b430799cdae52310a26 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.6.3" "August 2016"
+.TH NANO 1 "version 2.7.0" "September 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -48,9 +48,13 @@ contents of the cutbuffer at the current cursor position.
 When a more precise piece of text needs to be cut or copied, one can mark
 its start with \fB^6\fR, move the cursor to its end (the marked text will be
 highlighted), and then use \fB^K\fR to cut it, or \fBM-6\fR to copy it to the
-cutbuffer. One can also save the marked text to a file with \fB^O\fR, or
+cutbuffer.  One can also save the marked text to a file with \fB^O\fR, or
 spell check it with \fB^T\fR.
 .PP
+Since nano-2.7.0, text can also be selected by holding Shift and moving the
+cursor with the arrow keys.  Holding down the Alt key too will increase the
+stride.
+.PP
 The two lines at the bottom of the screen show the most important commands;
 the built-in help (\fB^G\fR) lists all the available ones.
 The default key bindings can be changed via the .nanorc file -- see
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index b27c674e6d2d9ad9cde3f31e9f2f32ad6fcf54e8..d2e47b1a3eb4d5031d1a3d16ce16a9ef7603dd09 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.6.3" "August 2016"
+.TH NANORC 5 "version 2.7.0" "September 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index f1a8efa8a1c5f96d0f4170194de5df84ca08fcab..ed58d5b9d80e97975baeedb4226cb3ab65e047d0 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.6.3" "August 2016"
+.TH RNANO 1 "version 2.7.0" "September 2016"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index d777472b99da4c4a68994b4e6738dd749ebaf8b4..83fe46ca8dc303725a13aea8fd51d7096e8dd8c3 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -6,8 +6,8 @@
 
 @smallbook
 @set EDITION 0.4
-@set VERSION 2.6.3
-@set UPDATED August 2016
+@set VERSION 2.7.0
+@set UPDATED September 2016
 
 @dircategory Editors
 @direntry
@@ -21,7 +21,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 2.6.3
+@subtitle version 2.7.0
 
 @author Chris Allegretta
 @page