diff --git a/AUTHORS b/AUTHORS
index def02887..ef1c4bdb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -50,6 +50,9 @@ Mahyar Abbaspour <mahyar.abaspour@gmail.com>
 Mike Scalora <mike@scalora.org>
 	* The comment/uncomment feature.
 
+Faissal Bensefia <faissaloo@gmail.com>
+	* Line numbers.
+
 Benno Schulenberg <bensberg@justemail.net>
 	* An array of small bug fixes, the cut-word and block-jump
 	  routines, text selection by holding Shift, and some extra
diff --git a/IMPROVEMENTS b/IMPROVEMENTS
index d200172d..0d2fb403 100644
--- a/IMPROVEMENTS
+++ b/IMPROVEMENTS
@@ -1,6 +1,9 @@
 Improvements in GNU nano
 ========================
 
+Since 2.7.0:
+  - The ability to display line numbers in front of the text.
+
 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.
diff --git a/NEWS b/NEWS
index 3ba34bfc..ba460e84 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+2016.10.29 - GNU nano 2.7.1 "Leuven" adds an often-asked-for feature: the
+		ability to display line numbers beside the text.  This can
+		be activated with -l or --linenumbers on the command line,
+		or with 'set linenumbers' in your nanorc, or toggled with
+		M-#.  The coloring of these numbers can be chosen via the
+		option 'set numbercolor'.  This release furthermore fixes
+		some bugs with scrolling in softwrap mode, is more strict
+		in the parsing of key rebindings, and marks a new buffer
+		as modified when the output of a command (^R ^X) has been
+		read into it.  Come and check it out!
+
 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
diff --git a/configure.ac b/configure.ac
index ed486b2a..329dc65b 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.7.0], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.7.1], [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 57ee46c0..5f63ce68 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.7.0" "September 2016"
+.TH NANO 1 "version 2.7.1" "October 2016"
 .\" Please adjust this date whenever revising the manpage.
 
 .SH NAME
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index c1ad8241..ad89b87b 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.7.0" "September 2016"
+.TH NANORC 5 "version 2.7.1" "October 2016"
 .\" Please adjust this date whenever revising the manpage.
 
 .SH NAME
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 7500ac81..89e3beb5 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.7.0" "September 2016"
+.TH RNANO 1 "version 2.7.1" "October 2016"
 .\" Please adjust this date whenever revising the manpage.
 
 .SH NAME
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 91469956..e887ea5c 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -6,8 +6,8 @@
 
 @smallbook
 @set EDITION 0.4
-@set VERSION 2.7.0
-@set UPDATED September 2016
+@set VERSION 2.7.1
+@set UPDATED October 2016
 
 @dircategory Editors
 @direntry
@@ -21,7 +21,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 2.7.0
+@subtitle version 2.7.1
 
 @author Chris Allegretta
 @page