diff --git a/README b/README
index fc0ea4bfd77fc5498e7a76de16da8c6c621c2a6a..e769061e23a678889f101543e2c5755cd271fd78 100644
--- a/README
+++ b/README
@@ -65,5 +65,12 @@ Bug Reports
Current Status
- GNU nano has reached its seventh milestone, 2.6.x. Since 2.5.0, it
- is a "rolling" release: bug fixing and development go hand in hand.
+ Since version 2.5.0, GNU nano has abandoned the distinction between
+ a stable and a development branch: it is now on a "rolling" release
+ -- fixing bugs and adding new features go hand in hand.
+
+Copyright Years
+
+ When in any file of this package a copyright notice mentions a
+ year range (such as 1999-2011), it is a shorthand for a list of
+ all the years in that interval.
diff --git a/configure.ac b/configure.ac
index a2f94c4d4aeb12a72eac0be93d6c89467406bc42..a9bbea9800da8f64e5a89432cb7583396426fc84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Configuration for GNU nano - a small and user-friendly text editor
#
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2017 Mike Frysinger
#
# GNU nano is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
diff --git a/doc/nano.1 b/doc/nano.1
index be68e4411a64ca1d49777b83f211cb77d394ab17..2853a9a7719e5e45878a4890843ca4c5b39417cf 100644
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -1,5 +1,4 @@
-.\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-.\" 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
+.\" Copyright (C) 1999-2011, 2013-2017 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:
diff --git a/doc/nano.texi b/doc/nano.texi
index 4e68943be67a26daa9369b27d9b99ec432d68301..94fe90e1bc40b82a41e4d2078ee1c556ea6e28cf 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -30,8 +30,7 @@ This manual documents GNU @code{nano}, a small and friendly text 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, 2015 Free Software Foundation, Inc.
+Copyright (C) 1999-2009, 2014-2017 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:
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index cf314ae3c49c2ab7bdc3d774bd2b90bd07274727..220f2e2142fc81ac97192aabfaddf694302322cf 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -1,5 +1,4 @@
-.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-.\" 2013, 2014, 2015 Free Software Foundation, Inc.
+.\" Copyright (C) 2003-2011, 2013-2017 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:
diff --git a/src/browser.c b/src/browser.c
index b45ca367e3a27251625e2251604816bc25f4fabe..20f30b3c312d6473d863aba9a02eb8996166bdcc 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -1,8 +1,7 @@
/**************************************************************************
* browser.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, *
- * 2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc. *
+ * Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2015, 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/chars.c b/src/chars.c
index 278c73f7e0b7992b0b0c2ac044fd0f6386cf9087..e4fc4050a8cafc250279d4ee1887f664cd66762a 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -1,8 +1,7 @@
/**************************************************************************
* chars.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, *
- * 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/color.c b/src/color.c
index 256354e60f5bcac74822fcada48aa6d2bfbeb0af..30cab76c2fb1988b6bc42e2e2a7b196d82560630 100644
--- a/src/color.c
+++ b/src/color.c
@@ -1,8 +1,7 @@
/**************************************************************************
* color.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, *
- * 2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc. *
+ * Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016, 2017 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/cut.c b/src/cut.c
index 25717bfbd1deaafc4a2824b0934c0c91b3cf0764..14b20864522b9f95a053aa86238324ac020b37fa 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -1,8 +1,7 @@
/**************************************************************************
* cut.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014 Mark Majeres *
* Copyright (C) 2016 Benno Schulenberg *
* *
diff --git a/src/files.c b/src/files.c
index 6581b2f05c93ea092e1a3cf3961060326870bb48..b64a58c0a53c3c6295c3ea8693a6d3cd33485b97 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,8 +1,7 @@
/**************************************************************************
* files.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2015, 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/global.c b/src/global.c
index 9ec76596bee5973473f1959ae30deef31629c0b2..6affae938d04a0d9cdfb37b9095cbdfa769ec97f 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1,8 +1,7 @@
/**************************************************************************
* global.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/help.c b/src/help.c
index d9569da73b969b39bfd31e3ee7b2f83bdca06fbf..a672d90a395cce15536d889102ddec8862c6e460 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,8 +1,7 @@
/**************************************************************************
* help.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, *
- * 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 2000-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/move.c b/src/move.c
index 30a2da6ca9bd40afeccec845fca6ea87706b861e..48debe730808d8e8f120542463eab4de6fc9455b 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1,8 +1,7 @@
/**************************************************************************
* move.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/nano.c b/src/nano.c
index 1bd9d353ff2a02c810f95ea4d6daf9d2eadf2665..eb00bd6588b4bc8385b16421328fe5c5f8a27297 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1,8 +1,7 @@
/**************************************************************************
* nano.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/nano.h b/src/nano.h
index 9e245bd8cdc501351d24ba12ec7218616d31730f..5be1ad5ae621d1f506734e5f8bfafe94a8598887 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -1,8 +1,7 @@
/**************************************************************************
* nano.h -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/prompt.c b/src/prompt.c
index 13a794971c5a3eff52cf9f9382be0388a2399d58..54749a40009e8f19fe8dc12cfcd166ce698fc9de 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -1,8 +1,7 @@
/**************************************************************************
* prompt.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/proto.h b/src/proto.h
index 4c2cdc820734e8f169588c331326803d05d23faa..83b35e3e38f76c104e9c2ddf1142bb7968c1267d 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -1,8 +1,7 @@
/**************************************************************************
* proto.h -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* *
* GNU nano is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published *
diff --git a/src/rcfile.c b/src/rcfile.c
index e751d860bf601cb369737f46ae2e99727782d7fc..a68d423ec01f6e1b0d59ba8fc60fea129ab2c636 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1,8 +1,7 @@
/**************************************************************************
* rcfile.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, *
- * 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 2001-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014 Mike Frysinger *
* Copyright (C) 2014, 2015, 2016 Benno Schulenberg *
* *
diff --git a/src/search.c b/src/search.c
index d9041c05304355b3ae9c2970982e3dd91431b42c..e68676174c0cf5ab5f260368cfee7d2e3fadceca 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,8 +1,7 @@
/**************************************************************************
* search.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2015, 2016, 2017 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/text.c b/src/text.c
index d0ef40d6e849ecffd616c3eaa6e0c1bd6b0f1366..93dcbc9febb35f9f63f9d1dcbfd06e6c527d0aea 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,8 +1,7 @@
/**************************************************************************
* text.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015 Mark Majeres *
* Copyright (C) 2016 Mike Scalora *
* Copyright (C) 2015, 2016 Benno Schulenberg *
diff --git a/src/utils.c b/src/utils.c
index 55159e1d71a77ea638424e7d42dc345b979c8813..8f1ebf7934d4de9642b2287dd5f741ca98e12e4b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,8 +1,7 @@
/**************************************************************************
* utils.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2016 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *
diff --git a/src/winio.c b/src/winio.c
index a37c67ce90420fb659911a5cd9804299cca8746f..36d474e45c5cab44ae9f3bdbb6115e99be5d3ca9 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1,8 +1,7 @@
/**************************************************************************
* winio.c -- This file is part of GNU nano. *
* *
- * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, *
- * 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. *
+ * Copyright (C) 1999-2011, 2013-2017 Free Software Foundation, Inc. *
* Copyright (C) 2014, 2015, 2016, 2017 Benno Schulenberg *
* *
* GNU nano is free software: you can redistribute it and/or modify *