diff --git a/ChangeLog b/ChangeLog
index c90369d87f21d861ad3bbdc16bacd4c1dab9bb25..1e0fec16f4de21f1edba27db75bc04716551f4db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ CVS code -
 	- Fixed null_at to ACTUALLY DO SOMETHING with its arg.  Again,
 	  this was causing nasty errors if the call to nrealloc moved
 	  where the data was located.
+	- Changed header comments to say "version 2" instead of "version
+	  1" as the COPYING file is actually version 2 of the GPL (bug
+	  noticed by Jordi Mallach).
 - cut.c:
   do_cut_text()
 	-  Check to see whether marked text is contained within edit
diff --git a/color.c b/color.c
index 99bf149a02e90e798c4072813eafe934a4dae07f..855d44f4e4d504ae84e2ed28cd03b69fd5f9571a 100644
--- a/color.c
+++ b/color.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/cut.c b/cut.c
index 5bc80f122ccb80ef11de2cb29f3e3b58bdacef6c..282bfc6bf9c0fd54b2c677a81845660cea173518 100644
--- a/cut.c
+++ b/cut.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/files.c b/files.c
index d63132580f594d65d7ed25adff27f87f2d702f05..07c7916669d6718a9ea4d7261799b3db01793e1d 100644
--- a/files.c
+++ b/files.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/global.c b/global.c
index d072a157934f2128767bca3398371234e832c779..cac1b63dcc6bd4f44a2016550e776ea87958640c 100644
--- a/global.c
+++ b/global.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/move.c b/move.c
index 75c40995bfcbbae21e1cdaff50c10690a6da6fad..9de82643b1db395c2176eeea6bf221b35f5aa3e0 100644
--- a/move.c
+++ b/move.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/nano.c b/nano.c
index f0006fb203c91528209925a67e3467f5ba072973..39ac73e01d191b1a9186a3352b6a8d060ec7e912 100644
--- a/nano.c
+++ b/nano.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/nano.h b/nano.h
index 06fd9f579e3e478270dcc60b9277c2daed2c7ce7..cfc3077709dd29e882c6b644b5869702d17bf6a5 100644
--- a/nano.h
+++ b/nano.h
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/proto.h b/proto.h
index 6c4e4a4344f17aa9b76f1f7b206de14a4d1de67d..711de036c46900ef06c5794dda96ad8a898e2c41 100644
--- a/proto.h
+++ b/proto.h
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/rcfile.c b/rcfile.c
index ce81e5091f4548427d6f2889ca9f4a50b4ccb146..98f6867fd279fd0c1ccf58119c685b9ff5aae152 100644
--- a/rcfile.c
+++ b/rcfile.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/search.c b/search.c
index a10ebbea7e0b2b06d2ec249d922308804b2a2963..d0437c02e82f6b92e23429d9f2578760ee157827 100644
--- a/search.c
+++ b/search.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 2000 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/utils.c b/utils.c
index 2c59711b040e235c611cb0d3404216f0c7700792..a413d67de9a681e27d28ba160ac70c23d9495846 100644
--- a/utils.c
+++ b/utils.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *
diff --git a/winio.c b/winio.c
index 2275ad15d879f3aa501c4e422331c93d54ebe72c..b13b633d617092594dc7dcfd2f08b8ffb9a2b7f6 100644
--- a/winio.c
+++ b/winio.c
@@ -5,7 +5,7 @@
  *   Copyright (C) 1999 Chris Allegretta                                  *
  *   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 1, or (at your option)  *
+ *   the Free Software Foundation; either version 2, or (at your option)  *
  *   any later version.                                                   *
  *                                                                        *
  *   This program is distributed in the hope that it will be useful,      *