31 files changed, 43 insertions, 41 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 61975aa6cb8..0b1173059c5 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -6233,7 +6233,7 @@
 
   GNU Emacs 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)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index bef8f1b9c29..1482ea6c5df 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -6,7 +6,7 @@
 
 # GNU Emacs 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 39c5901348f..96f1643891f 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -7,8 +7,8 @@
 
 # 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 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
 
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,9 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-# USA.
+# along with this program; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA.
 
 # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>.
 
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index f82f877923e..d892d77dc5a 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 16d386f5b4e..08e5d813361 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -8,7 +8,7 @@
 
    GNU Emacs 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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index b1348f8e841..ea230a9c3cd 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -7,7 +7,7 @@
 
    GNU Emacs 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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index ea1e6cd7af8..9edba132134 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index f04a8b3f545..7b39d2ed8fd 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 1d1f16ddf28..6c61847546a 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -36,8 +36,8 @@ This file is not considered part of GNU Emacs.
 
 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 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,8 +45,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
 
 
 /* NB To comply with the above BSD license, copyright information is
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index e35c0f8a072..003f2da886c 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index b6d6b881de7..587c2e0f618 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -9,7 +9,7 @@
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index c2bec4f8e9a..25f616250c1 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -5,7 +5,7 @@
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h
index 377c4837548..7cccef3eeea 100644
--- a/lib-src/getopt_.h
+++ b/lib-src/getopt_.h
@@ -5,7 +5,7 @@
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h
index 25df3bbcfdc..049f4762900 100644
--- a/lib-src/getopt_int.h
+++ b/lib-src/getopt_int.h
@@ -5,7 +5,7 @@
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/lib-src/gettext.h b/lib-src/gettext.h
index ed329003843..4a5941f86dc 100644
--- a/lib-src/gettext.h
+++ b/lib-src/gettext.h
@@ -4,7 +4,7 @@
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index d2e9ecfd7ee..1dff1e3e6b7 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -7,7 +7,7 @@
 #
 # GNU Emacs 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 7cabdc95a66..98561cf604d 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -6,8 +6,8 @@ This file is not considered part of GNU Emacs.
 
 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 of the License, or
-(at your option) any later version.
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+along with this program; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index d76bdd527cf..3f3da3e7007 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index b552160c759..3076b85dbd8 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -6,7 +6,7 @@
 #
 #  GNU Emacs 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)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #
 #  GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 84d4f949b2f..aaaf91b1b1f 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 5f6c12abceb..e11733f9605 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index a5655519fe1..267e8ba5a04 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -6,7 +6,7 @@
 
    GNU Emacs 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) any later
+   Free Software Foundation; either version 3, or (at your option) any later
    version.
 
    GNU Emacs is distributed in the hope that it will be useful, but WITHOUT
diff --git a/lib-src/pop.c b/lib-src/pop.c
index a829607faa5..9fcbe4b370c 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 664fb26f7db..85b666c652f 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 1174666da78..628b72ddcfe 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 1ec783934e6..94396709e65 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -9,7 +9,7 @@
 #
 # GNU Emacs 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 371a52de66c..c81f51d4d60 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -59,7 +59,7 @@ Id='$Id$'
 
 # 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 28f736ab843..e239eaab428 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -8,7 +8,7 @@
 
    GNU Emacs 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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index cd504c8c538..4913f094614 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -7,7 +7,7 @@
 
    GNU Emacs 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)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 9f1c011ce79..3ccfecdb7d7 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs 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)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 21c6e70e9d8..4fd6fb47226 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -10,7 +10,7 @@
 #
 # GNU Emacs 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,