diff --git a/ChangeLog b/ChangeLog
index 37aea8f372c891c0c28c8889e5026d10a46266b0..4947202e0e2b488ba78e684951977e88be8ac48d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 CVS code -
 - General:
 	- Miscellaneous comment fixes. (DLR)
+	- Fix copyright notices to not abbreviate the year list using a
+	  range.  Changes to do_credits() and all source files. (DLR)
 - files.c:
   get_full_path()
 	- Remove unneeded assert. (DLR)
@@ -11,6 +13,9 @@ CVS code -
 	  overwriting an existing file when in restricted mode. (DLR)
 	- Fix problem where a file could sometimes be overwritten
 	  without a warning prompt. (DLR)
+- doc/rnano.1, doc/fr/rnano.1:
+	- Add missing "(C)" to the copyright notice in the comments.
+	  (DLR)
 - NEWS:
 	- Add missing entries for nano 1.0.2 and 1.0.3, since 1.1.0
 	  includes their changes. (DLR)
diff --git a/doc/man/fr/rnano.1 b/doc/man/fr/rnano.1
index 2847c4e1cb1b837ad2e4c452067bf920abe7e0d3..a381f9beabacbbe80af486f45f269482df86a79c 100644
--- a/doc/man/fr/rnano.1
+++ b/doc/man/fr/rnano.1
@@ -1,5 +1,5 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" rnano.1 is Copyright 2005, 2006 by Thijs Kinkhorst
+.\" rnano.1 is Copyright (C) 2005, 2006 by Thijs Kinkhorst
 .\" <thijs@kinkhorst.com>; skeleton based on nano-tiny.1 by Jordi
 .\" Mallach <jordi@gnu.org>.
 .\"
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index ef6d797be738531654aa20b0c737e63bf925f440..4efa3cd0451ae0ab1844f739ede6fedd39c09bef 100644
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -1,5 +1,5 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" rnano.1 is Copyright 2005, 2006 by Thijs Kinkhorst
+.\" rnano.1 is Copyright (C) 2005, 2006 by Thijs Kinkhorst
 .\" <thijs@kinkhorst.com>; skeleton based on nano-tiny.1 by Jordi
 .\" Mallach <jordi@gnu.org>.
 .\"
diff --git a/src/browser.c b/src/browser.c
index df62043440f350b34b2cc1b1fc286a025c9ce1b4..578fa8ecfd779ecb6ca688e06420530252d5c16c 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   browser.c                                                            *
  *                                                                        *
- *   Copyright (C) 2001-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta                *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/chars.c b/src/chars.c
index 2496a0eb5276c0fd7f45b049f912490958fd3e66..b464a862808bd79c92a0e6907145bb9c1e14eaf1 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   chars.c                                                              *
  *                                                                        *
- *   Copyright (C) 2001-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta                *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/cut.c b/src/cut.c
index 171574b1079b9d6b8c64792b3415a6e2281f45c3..2c15b410fcbfa15abe68e73a24f14300daf2aba4 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   cut.c                                                                *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/files.c b/src/files.c
index e20e7a16dd21a444ef31ac483a7b2fda2c31aab5..60d67980d59684605c48e5b474736b7ea0fb249e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   files.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/global.c b/src/global.c
index 719499fb5e7e702a3bdd4733f978841e1d5e5588..76ef06d1d8804f507049d05a109daf8bd5879bc5 100644
--- a/src/global.c
+++ b/src/global.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   global.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/help.c b/src/help.c
index 3c6e9ad404c19e4aa8c2220081b5612ee6cb7535..ac6fc22b4bd8df2b497bad801b4a70b8d9a4969e 100644
--- a/src/help.c
+++ b/src/help.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   help.c                                                               *
  *                                                                        *
- *   Copyright (C) 2000-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2000, 2001, 2002, 2003, 2004 Chris Allegretta          *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/move.c b/src/move.c
index 45b9533861d53cd1de63809a850ed515bf79acfe..d217501e8a4c2a927366434c1b794a4f5148bddc 100644
--- a/src/move.c
+++ b/src/move.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   move.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/nano.c b/src/nano.c
index 43cf81ee120746731372ca300240e476b55f3b7b..db219f7955536df1b4ccee4d2a7051e62a5e42d0 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   nano.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/nano.h b/src/nano.h
index 389a107663424b9de68c3f14c0e9536855b12619..a1108fe4b5e091f38baf58d860bb12bcd1a0270b 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   nano.h                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/prompt.c b/src/prompt.c
index bacf1956fc259062bc57d2d1908b121ac3319c0e..67d5aa0df3bf948ade344385c000a5b5c287fd9a 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   prompt.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/proto.h b/src/proto.h
index 4e13dde0f59117eed613dea11fa3ef32427ee65d..ed908d03821a5b1d9c10f3219bcf55a349d68451 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   proto.h                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/rcfile.c b/src/rcfile.c
index 58d8dff07fa5fb32193659594c8d98cc750d6c45..f01866d3c7bd77c3f3ade1cbd6e432ae4134fa12 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   rcfile.c                                                             *
  *                                                                        *
- *   Copyright (C) 2001-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 2001, 2002, 2003, 2004 Chris Allegretta                *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/search.c b/src/search.c
index f7741dbe3dd95c7c484a9ddd34509f4ff0b72cad..402f37d6ec8de85e5eba82496cec49a03e4b4016 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   search.c                                                             *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/text.c b/src/text.c
index 826f31465b5d2fdccf6a2b7c005165ab4df43141..5dbfcdb942dd3a41f17a2bd87c24288abce732d0 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   text.c                                                               *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/utils.c b/src/utils.c
index 1df715e7f638829d7cae29eb2b868a6cc109640d..b2fa0345ce427191de71f36ebeec5047ea01a149 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   utils.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
diff --git a/src/winio.c b/src/winio.c
index 85961ff0988a38513f0567eb66f301d3d63ceb91..05bc84dbeb03d30313cffbbeaf9629c135e6b348 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2,8 +2,8 @@
 /**************************************************************************
  *   winio.c                                                              *
  *                                                                        *
- *   Copyright (C) 1999-2004 Chris Allegretta                             *
- *   Copyright (C) 2005-2006 David Lawrence Ramsey                        *
+ *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta    *
+ *   Copyright (C) 2005, 2006 David Lawrence Ramsey                       *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 2, or (at your option)  *
@@ -3199,8 +3199,8 @@ void do_credits(void)
 	"",
 	"",
 	"",
-	"(c) 1999-2004 Chris Allegretta",
-	"(c) 2005-2006 David Lawrence Ramsey",
+	"(c) 1999, 2000, 2001, 2002, 2003, 2004 Chris Allegretta",
+	"(c) 2005, 2006 David Lawrence Ramsey",
 	"",
 	"",
 	"",