Refill some long/short copyright headers.

author: Glenn Morris 2011-01-26 00:36:39 -0800
committer: Glenn Morris 2011-01-26 00:36:39 -0800
commit: 95df8112a0cbdb06addbac5fbea03b37d4440418 (patch)
tree: 40de7680f5332a55701dc1477722357dd37803b3
parent: 008cad902f3434dc8c490dd0488ae93df4f16d9c (diff)
download: emacs-95df8112a0cbdb06addbac5fbea03b37d4440418.tar.gz
emacs-95df8112a0cbdb06addbac5fbea03b37d4440418.zip
458 files changed, 592 insertions, 881 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ed80388bdd..012274ce944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8918,8 +8918,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1993-1999, 2001-2011
+  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/INSTALL.BZR b/INSTALL.BZR
index 48bbccf9c55..c5e1e62a32d 100644
--- a/INSTALL.BZR
+++ b/INSTALL.BZR
@@ -1,5 +1,4 @@
-Copyright (C) 2002-2011
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/Makefile.in b/Makefile.in
index 05f54e2fc18..e45cb927c5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,8 +2,7 @@
 # DIST: make most of the changes to this file you might want, so try
 # DIST: that first.
-# Copyright (C) 1992-2011
+# Copyright (C) 1992-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 2ce651b34e0..e09ddd62b97 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,6 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001-2011
-     Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/admin/build-configs b/admin/build-configs
index 6b4a938c7b7..79ba58aeec0 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,8 +1,7 @@
 #! /usr/bin/perl
 # Build Emacs in several different configurations.
-# Copyright (C) 2001-2011
+# Copyright (C) 2001-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/admin/cus-test.el b/admin/cus-test.el
index adb00110553..b254fedccc4 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,7 +1,6 @@
 ;;; cus-test.el --- tests for custom types and load problems
-;; Copyright (C) 1998, 2000, 2002-2011
+;; Copyright (C) 1998, 2000, 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
 ;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 79a9d59e385..59ae1a6f26c 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,7 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2001-2011
+# Copyright (C) 2001-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
@@ -40,5 +39,3 @@ tar tzf $old_tar | sed -e 's,^[^/]*,,' | sort > $old_tmp
 tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp
 diff -u $old_tmp $new_tmp
 rm -f $new_tmp $old_tmp
diff --git a/admin/make-emacs b/admin/make-emacs
index 8964499f5d7..b21dcad5f37 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -2,8 +2,7 @@
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
-# Copyright (C) 2001-2011
+# Copyright (C) 2001-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
@@ -184,4 +183,3 @@ exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV";
 # Local Variables:
 # mode: cperl
 # End:
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 0a5fa0a0b5b..e873e29f2d6 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -7568,8 +7568,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1993-1999, 2001-2011
+  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index d50529e9803..0ba396e6427 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -1,7 +1,6 @@
 #### Makefile for the Emacs Manual
-# Copyright (C) 1994, 1996-2011
+# Copyright (C) 1994, 1996-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi
index 7495c6e6617..374886cd956 100644
--- a/doc/emacs/arevert-xtra.texi
+++ b/doc/emacs/arevert-xtra.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004-2011
+@c Copyright (C) 2004-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 41d37dcd2f4..b936636403a 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004-2011
+@c Copyright (C) 2004-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/doc/emacs/dired-xtra.texi b/doc/emacs/dired-xtra.texi
index 1a9100b63d9..efb05226ba8 100644
--- a/doc/emacs/dired-xtra.texi
+++ b/doc/emacs/dired-xtra.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004-2011
+@c Copyright (C) 2004-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi
index 576bf1c54e1..b46868cf52b 100644
--- a/doc/emacs/emerge-xtra.texi
+++ b/doc/emacs/emerge-xtra.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004-2011
+@c Copyright (C) 2004-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi
index f1625036c9f..8f92df3f3ae 100644
--- a/doc/emacs/fortran-xtra.texi
+++ b/doc/emacs/fortran-xtra.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004-2011
+@c Copyright (C) 2004-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index 04945e76bc9..422ae261395 100644
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -1,7 +1,6 @@
 #### -*- Makefile -*- for the Emacs Manual
-# Copyright (C) 2003-2011
+# Copyright (C) 2003-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi
index f37d71faf82..978a2a31a2e 100644
--- a/doc/emacs/vc-xtra.texi
+++ b/doc/emacs/vc-xtra.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004-2011
+@c Copyright (C) 2004-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included in emacs-xtra.texi when producing the printed
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 20852207c40..05e89e69f0e 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -1,6 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004-2011
+@c Copyright (C) 2004-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in vc-xtra.texi (when producing the
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 31494d0f830..df356f1b132 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -1,7 +1,6 @@
 #### Makefile for the Emacs Lisp Introduction manual
-# Copyright (C) 1994-1999, 2001-2011
+# Copyright (C) 1994-1999, 2001-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/doc/lispintro/README b/doc/lispintro/README
index 5d0265c8d1d..ba4e727cc8e 100644
--- a/doc/lispintro/README
+++ b/doc/lispintro/README
@@ -1,5 +1,4 @@
-Copyright (C) 2001-2011
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps
index 44e91fb7858..99e3581f38e 100644
--- a/doc/lispintro/drawers.eps
+++ b/doc/lispintro/drawers.eps
@@ -9,8 +9,7 @@
 %%EndComments
 %%BeginProlog
-% Copyright (C) 2001-2011
+% Copyright (C) 2001-2011  Free Software Foundation, Inc.
-%   Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in
index 08f8bfcddb8..7294d46b693 100644
--- a/doc/lispintro/makefile.w32-in
+++ b/doc/lispintro/makefile.w32-in
@@ -1,7 +1,6 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
-# Copyright (C) 2003-2011
+# Copyright (C) 2003-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 2b769f41524..a9664a4e197 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -1,7 +1,6 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
-# Copyright (C) 1990-1996, 1998-2011
+# Copyright (C) 1990-1996, 1998-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/doc/lispref/README b/doc/lispref/README
index d4358b69459..a9c0922640b 100644
--- a/doc/lispref/README
+++ b/doc/lispref/README
@@ -1,5 +1,4 @@
-Copyright (C) 2001-2011
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi
index 098afc11693..3add7b174d2 100644
--- a/doc/lispref/back.texi
+++ b/doc/lispref/back.texi
@@ -1,7 +1,6 @@
 \input texinfo  @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 2001-2011
+@c Copyright (C) 2001-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @c
 @c %**start of header
diff --git a/doc/lispref/elisp-covers.texi b/doc/lispref/elisp-covers.texi
index 0f809790d91..92dfb7a074f 100644
--- a/doc/lispref/elisp-covers.texi
+++ b/doc/lispref/elisp-covers.texi
@@ -1,7 +1,6 @@
 \input texinfo    @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 2001-2011
+@c Copyright (C) 2001-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @c
 @comment %**start of header
diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi
index fcf13bd00b5..55973adac59 100644
--- a/doc/lispref/lay-flat.texi
+++ b/doc/lispref/lay-flat.texi
@@ -1,7 +1,6 @@
 \input texinfo    @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 2001-2011
+@c Copyright (C) 2001-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @c
 @comment %**start of header
diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index 5c80f70272c..ee21d8762b9 100644
--- a/doc/lispref/makefile.w32-in
+++ b/doc/lispref/makefile.w32-in
@@ -1,7 +1,6 @@
 # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
-# Copyright (C) 2003-2011
+# Copyright (C) 2003-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index 2ebf8ab9f2f..373e1e2b5c7 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -1,7 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 2010-2011
+@c Copyright (C) 2010-2011  Free Software Foundation, Inc.
-@c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/package
 @node Packaging, Antinews, System Interface, Top
diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt
index 0f39ed181fb..99b48d342ab 100644
--- a/doc/lispref/two-volume-cross-refs.txt
+++ b/doc/lispref/two-volume-cross-refs.txt
@@ -1,6 +1,5 @@
-Copyright (C) 2001-2011
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
+See end for copying conditions.
-  See end for copying conditions.
 Two Volume Cross References
 ===========================
diff --git a/doc/lispref/two.el b/doc/lispref/two.el
index fad6efe19cf..b3a8666bcf2 100644
--- a/doc/lispref/two.el
+++ b/doc/lispref/two.el
@@ -1,7 +1,6 @@
 ;; Auxiliary functions for preparing a two volume manual.
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; --rjc 30mar92
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d657d403558..a8a9ca6772b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -7567,8 +7567,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1993-1999, 2001-2011
+  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 8c9b1085618..f1dbf3bcc08 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,7 +1,6 @@
 #### Makefile for documentation other than the Emacs manual.
-# Copyright (C) 1994, 1996-2011
+# Copyright (C) 1994, 1996-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 8c553531a0b..918d83539a2 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -1,7 +1,6 @@
 #### -*- Makefile -*- for documentation other than the Emacs manual.
-# Copyright (C) 2003-2011
+# Copyright (C) 2003-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index b2fcfb76c2b..df5dd7daefc 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -1,5 +1,4 @@
-Copyright (C) 2006-2011
+Copyright (C) 2006-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See end for license conditions.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 955709e9aac..75670ff0218 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -5194,8 +5194,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1993-1999, 2001-2011
+  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/etc/MACHINES b/etc/MACHINES
index b5a1eadc060..126ae40cb57 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1,6 +1,7 @@
 Emacs machines list
-Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2011
+  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 This is a list of the status of GNU Emacs on various machines and systems.
@@ -401,4 +402,3 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 5409bc98fd6..90d96c12fb8 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
-Copyright (C) 1993-1995, 2001, 2006-2011
+Copyright (C) 1993-1995, 2001, 2006-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
@@ -6541,4 +6540,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 7dedb5a96e8..47f61a13e3b 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
-Copyright (C) 2000-2011
+Copyright (C) 2000-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index a4d687258c7..3920f59fefa 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
-Copyright (C) 2001-2011
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-          Free Software Foundation, Inc.
 See the end of the file for license conditions.
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
@@ -5606,4 +5605,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
diff --git a/etc/README b/etc/README
index a4210ebcf02..d1cad4a3a0f 100644
--- a/etc/README
+++ b/etc/README
@@ -9,6 +9,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 File: emacs.icon
  Author: Sun Microsystems, Inc
-  Copyright (C) 1999, 2001-2011
+  Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/TERMS b/etc/TERMS
index 2edeab11fae..e361188247b 100644
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -1,5 +1,4 @@
-Copyright (C) 1999, 2001-2011
+Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 This file describes what you must or might want to do to termcap entries
diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg
index 7d5a7d78583..aad6560a004 100644
--- a/etc/images/gnus/gnus.svg
+++ b/etc/images/gnus/gnus.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
-   Copyright (C) 2008-2011
+   Copyright (C) 2008-2011  Free Software Foundation, Inc.
-   Free Software Foundation, Inc.
   Author: Francesc Rocher <f.rocher@member.fsf.org>
diff --git a/etc/images/tree-widget/default/README b/etc/images/tree-widget/default/README
index 71db7e8d678..ccc6cdbf21e 100644
--- a/etc/images/tree-widget/default/README
+++ b/etc/images/tree-widget/default/README
@@ -5,6 +5,5 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png end-guide.xpm
       no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png
       open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004-2011
+Copyright (C) 2004-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/tree-widget/folder/README b/etc/images/tree-widget/folder/README
index 1b839349e18..58716db456d 100644
--- a/etc/images/tree-widget/folder/README
+++ b/etc/images/tree-widget/folder/README
@@ -5,6 +5,5 @@ Files:  close.png close.xpm empty.png empty.xpm end-guide.png
        leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png
        no-handle.xpm open.png open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004-2011
+Copyright (C) 2004-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index bff6f5b53ab..ed48807b068 100644
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -1,8 +1,7 @@
 % === BEGIN ps-print prologue 0
 % version: 6.0
-% Copyright (C) 2000-2011
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   Free Software Foundation, Inc.
 % This file is part of GNU Emacs.
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 71f744f1705..dbb0db846bf 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -1,8 +1,7 @@
 % === BEGIN ps-print prologue 1
 % version: 6.1
-% Copyright (C) 2000-2011
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   Free Software Foundation, Inc.
 % This file is part of GNU Emacs.
diff --git a/etc/refcards/README b/etc/refcards/README
index 2f9b5714c12..fa5ae9258eb 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -12,6 +12,5 @@ it is reproduced here for convenience.
 File: gnus-logo.eps, gnus-logo.pdf
  Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001-2011
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 372102d8bce..8b9456b4a63 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 8553d98ee6f..61caccbea8e 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % French translation: Eric Jacoboni
diff --git a/etc/refcards/gnus-logo.eps b/etc/refcards/gnus-logo.eps
index c47e446a538..36659ebfb4b 100644
--- a/etc/refcards/gnus-logo.eps
+++ b/etc/refcards/gnus-logo.eps
@@ -1,6 +1,5 @@
 %!PS-Adobe-2.0 EPSF-2.0
-% Copyright (C) 2000-2011
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   Free Software Foundation, Inc.
 %
 % Author: Luis Fernandes <elf@ee.ryerson.ca>
 %
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 894cc6ad219..f35ed209149 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -17,7 +17,8 @@
 \pdflayout=(0l)
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 % This file is part of GNU Emacs.
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index edf702a2976..4091f59d1f6 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2011
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Portuguese translation: Rodrigo Real <rreal@ucpel.tche.br>
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index f0038b9708d..52b9348db26 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 08b21d4eddb..789bbaea92f 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo
index bd7849018db..f95f3317abf 100644
--- a/etc/tutorials/TUTORIAL.eo
+++ b/etc/tutorials/TUTORIAL.eo
@@ -1081,7 +1081,8 @@ la dosiero verkita de Stuart Cracraft por la originala Emakso.
 kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj
 kondi�oj estas observataj:
-   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2011
+     Free Software Foundation, Inc.
   �i tiu dosiero estas parto de "GNU Emacs".
 
@@ -1113,4 +1114,3 @@ kaj kompletigis Sergio B. Pokrovskij.
 ;;; Local Variables:
 ;;;   coding: latin-3
 ;;; End:
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 31b6287e4f4..037d991ae3a 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for leim subdirectory in GNU Emacs.
-# Copyright (C) 1997-2011
-#   Free Software Foundation, Inc.
+# Copyright (C) 1997-2011  Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 #   2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/README b/leim/README
index 52d6416b580..a47bd7664d8 100644
--- a/leim/README
+++ b/leim/README
@@ -1,5 +1,4 @@
-Copyright (C) 2001-2011
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/leim/leim-ext.el b/leim/leim-ext.el
index 288fc47250c..0a12fdde58a 100644
--- a/leim/leim-ext.el
+++ b/leim/leim-ext.el
@@ -1,7 +1,6 @@
 ;; leim-ext.el -- extra leim configuration      -*- coding:utf-8; -*-
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index df6f0b2daed..08b029db861 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -1,6 +1,6 @@
 # -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000-2011
-#   Free Software Foundation, Inc.
+# Copyright (C) 2000-2011  Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 #   2006, 2007
 #   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/croatian.el b/leim/quail/croatian.el
index 763c99dd0f5..7f394979261 100644
--- a/leim/quail/croatian.el
+++ b/leim/quail/croatian.el
@@ -1,7 +1,6 @@
 ;;; quail/croatian.el -- Quail package for inputing Croatian  -*-coding: iso-8859-2;-*-
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Hrvoje Nik�i� <hniksic@xemacs.org>
 ;; Keywords: i18n
diff --git a/leim/quail/cyril-jis.el b/leim/quail/cyril-jis.el
index 93c39b7fba0..878c6f53281 100644
--- a/leim/quail/cyril-jis.el
+++ b/leim/quail/cyril-jis.el
@@ -1,7 +1,6 @@
 ;;; cyril-jis.el --- Quail package for inputting JISX0208 Cyrillic letters
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 40699855fc9..7eaaab4aebc 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1,7 +1,6 @@
 ;;; cyrillic.el --- Quail package for inputting Cyrillic characters
-;; Copyright (C) 1997-1998, 2001-2011
+;; Copyright (C) 1997-1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/czech.el b/leim/quail/czech.el
index 04cb3a3889e..334045eac32 100644
--- a/leim/quail/czech.el
+++ b/leim/quail/czech.el
@@ -1,7 +1,6 @@
 ;;; czech.el --- Quail package for inputting Czech -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Milan Zamazal <pdm@zamazal.org>
 ;; Maintainer: Pavel Jan,Bm(Bk <Pavel@Janik.cz>
diff --git a/leim/quail/georgian.el b/leim/quail/georgian.el
index efe23f931ed..d9d8519867d 100644
--- a/leim/quail/georgian.el
+++ b/leim/quail/georgian.el
@@ -1,7 +1,6 @@
 ;;; georgian.el --- Quail package for inputting Georgian characters  -*-coding: utf-8;-*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/leim/quail/greek.el b/leim/quail/greek.el
index 428c3eea319..4deeb86fb4d 100644
--- a/leim/quail/greek.el
+++ b/leim/quail/greek.el
@@ -1,7 +1,6 @@
 ;;; greek.el --- Quail package for inputting Greek -*-coding: iso-2022-7bit-*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/hanja.el b/leim/quail/hanja.el
index 3d27f98b909..029309f4c15 100644
--- a/leim/quail/hanja.el
+++ b/leim/quail/hanja.el
@@ -1,7 +1,6 @@
 ;;; hanja.el --- Quail-package for Korean Hanja (KSC5601)  -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/hanja3.el b/leim/quail/hanja3.el
index f7b5f810e9c..aa0fc7948af 100644
--- a/leim/quail/hanja3.el
+++ b/leim/quail/hanja3.el
@@ -1,7 +1,6 @@
 ;;; hanja3.el --- Quail-package for Korean Hanja (KSC5601)  -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 1997, 1999, 2001-2011
+;; Copyright (C) 1997, 1999, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Koaunghi Un <koanughi.un@zdv.uni-tuebingen.de>
 ;; Keywords: mule, quail, multilingual, input method, Korean, Hanja
diff --git a/leim/quail/indian.el b/leim/quail/indian.el
index d2109576cc9..a3f3963e31d 100644
--- a/leim/quail/indian.el
+++ b/leim/quail/indian.el
@@ -1,7 +1,6 @@
 ;;; indian.el --- Quail packages for inputting Indian
-;; Copyright (C) 2000-2011
+;; Copyright (C) 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: KAWABATA, Taichi <kawabata@m17n.org>
diff --git a/leim/quail/japanese.el b/leim/quail/japanese.el
index dd9eb6e81df..f51bddbf3b4 100644
--- a/leim/quail/japanese.el
+++ b/leim/quail/japanese.el
@@ -1,7 +1,6 @@
 ;;; japanese.el --- Quail package for inputting Japanese  -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/latin-alt.el b/leim/quail/latin-alt.el
index 1184190c68b..2276ba3e2a5 100644
--- a/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@ -1,8 +1,8 @@
 ;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: utf-8;-*-
-;; Copyright (C) 1997-1998, 2001-2011
+;; Copyright (C) 1997-1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;;   2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
diff --git a/leim/quail/latin-ltx.el b/leim/quail/latin-ltx.el
index f8e81ba8689..b3cc647737c 100644
--- a/leim/quail/latin-ltx.el
+++ b/leim/quail/latin-ltx.el
@@ -1,8 +1,8 @@
 ;;; latin-ltx.el --- Quail package for TeX-style input -*-coding: utf-8;-*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;;   2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
diff --git a/leim/quail/latin-post.el b/leim/quail/latin-post.el
index c81338bee72..bca518b5121 100644
--- a/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@ -1,7 +1,6 @@
 ;;; latin-post.el --- Quail packages for inputting various European characters  -*-coding: utf-8;-*-
-;; Copyright (C) 1997-1998, 2001-2011
+;; Copyright (C) 1997-1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/latin-pre.el b/leim/quail/latin-pre.el
index c9ae0c214b9..c45a3009970 100644
--- a/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@ -1,7 +1,6 @@
 ;;; latin-pre.el --- Quail packages for inputting various European characters  -*-coding: utf-8;-*-
-;; Copyright (C) 1997-2011
+;; Copyright (C) 1997-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/lrt.el b/leim/quail/lrt.el
index ba4289aacba..d184db3317a 100644
--- a/leim/quail/lrt.el
+++ b/leim/quail/lrt.el
@@ -1,7 +1,6 @@
 ;;; lrt.el --- Quail package for inputting Lao characters by LRT method  -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/py-punct.el b/leim/quail/py-punct.el
index aae28ac12a9..86919128011 100644
--- a/leim/quail/py-punct.el
+++ b/leim/quail/py-punct.el
@@ -1,7 +1,6 @@
 ;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols)  -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/rfc1345.el b/leim/quail/rfc1345.el
index 0e1333c809c..a74dd05f7ef 100644
--- a/leim/quail/rfc1345.el
+++ b/leim/quail/rfc1345.el
@@ -1,7 +1,6 @@
 ;;; rfc1345.el --- Quail method for RFC 1345 mnemonics -*- coding: utf-8 -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/leim/quail/sgml-input.el b/leim/quail/sgml-input.el
index 90e3ae039a6..3b569879404 100644
--- a/leim/quail/sgml-input.el
+++ b/leim/quail/sgml-input.el
@@ -1,7 +1,6 @@
 ;;; sgml-input.el --- Quail method for Unicode entered as SGML entities -*- coding: utf-8 -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/leim/quail/slovak.el b/leim/quail/slovak.el
index 5a112006b63..cfc35b07ca2 100644
--- a/leim/quail/slovak.el
+++ b/leim/quail/slovak.el
@@ -1,7 +1,6 @@
 ;;; slovak.el --- Quail package for inputting Slovak  -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors: Tibor ,B)(Bimko <tibor.simko@fmph.uniba.sk>
 ;;      Milan Zamazal <pdm@zamazal.org>
diff --git a/leim/quail/symbol-ksc.el b/leim/quail/symbol-ksc.el
index e9ae58b8551..15e78eb9866 100644
--- a/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@ -1,7 +1,6 @@
 ;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el
index ce118999174..e1a95d193c8 100644
--- a/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@ -1,7 +1,6 @@
 ;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index ff1c8306ba1..d532b16ab0e 100644
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -1,7 +1,6 @@
 ;;; uni-input.el --- Hex Unicode input method
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
diff --git a/leim/quail/vntelex.el b/leim/quail/vntelex.el
index c83544d29ff..40380ee27ef 100644
--- a/leim/quail/vntelex.el
+++ b/leim/quail/vntelex.el
@@ -1,7 +1,6 @@
 ;;; vntelex.el --- Quail package for Vietnamese by Telex method
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:   Werner Lemberg <wl@gnu.org>
 ;; Keywords: multilingual, input method, Vietnamese
diff --git a/leim/quail/welsh.el b/leim/quail/welsh.el
index ae3a66fded4..3085bbc358f 100644
--- a/leim/quail/welsh.el
+++ b/leim/quail/welsh.el
@@ -1,7 +1,6 @@
 ;;; welsh.el --- Quail package for inputting Welsh characters  -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 7975ebecd62..682aa10aa39 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,6 +1,8 @@
 /* movemail foo bar -- move file foo to file bar,
   locking file foo the way /bin/mail respects.
-   Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1986, 1992-1994, 1996, 1999, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 38961ee1bd4..a3fda09d44f 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,5 +1,7 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
-   Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1991, 1993, 1996-1997, 1999, 2001-2011
+  Free Software Foundation, Inc.
 Author: Jonathan Kamens <jik@security.ov.com>
@@ -1623,4 +1625,3 @@ find_crlf (char *in_string, int len)
 }
 #endif /* MAIL_USE_POP */
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index f3d21e781c9..9466bf7b149 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,7 +1,6 @@
 /* update-game-score.c --- Update a score file
-Copyright (C) 2002-2011
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 Author: Colin Walters <walters@debian.org>
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 36e4017f0d8..0f975cd0ee3 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -3,7 +3,8 @@
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
-# Copyright (C) 1992-1993, 1995, 1997, 2001-2011  Free Software Foundation, Inc.
+# Copyright (C) 1992-1993, 1995, 1997, 2001-2011
+#   Free Software Foundation, Inc.
 # Author: Paul Eggert
 # (according to authors.el)
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index 2271f107f29..f1c931589d1 100644
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -3247,8 +3247,7 @@
                Set current buffer variables from defaults
                in case user's init file has changed them.
-    Copyright (C) 1985-1986, 2001-2011
+  Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
-      Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -3264,4 +3263,3 @@
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 87e7ae2431a..76bac50c4b8 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -14336,8 +14336,7 @@ See ChangeLog.10 for earlier changes.
 ;; coding: utf-8
 ;; End:
-    Copyright (C) 2003-2011
+  Copyright (C) 2003-2011  Free Software Foundation, Inc.
-      Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -14353,4 +14352,3 @@ See ChangeLog.10 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 7924d164cf1..5793c3180be 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -1,6 +1,7 @@
 ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
-;; Copyright (C) 1985-1987, 1994-1995, 1998, 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1994-1995, 1998, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Charlie Martin <crm@cs.duke.edu>
 ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index cb299d46e2d..4c0dd64a2cf 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1,7 +1,6 @@
 ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
-;; Copyright (C) 1993-1997, 2001-2011
+;; Copyright (C) 1993-1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: Karl Fogel <kfogel@red-bean.com>
diff --git a/lisp/calc/README b/lisp/calc/README
index ccaaeb35c35..e1170fc6df7 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -1,5 +1,4 @@
-Copyright (C) 2001-2011
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/lisp/calc/README.prev b/lisp/calc/README.prev
index 22fc8c51f73..69da211efc2 100644
--- a/lisp/calc/README.prev
+++ b/lisp/calc/README.prev
@@ -1,5 +1,4 @@
-Copyright (C) 2001-2011
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 21836f4f6c2..c0f4f0f3929 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -1,6 +1,7 @@
 ;;; appt.el --- appointment notification functions
-;; Copyright (C) 1989-1990, 1994, 1998, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1989-1990, 1994, 1998, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index 4e90ea5c072..ae5dc02862d 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -1,7 +1,6 @@
 ;;; cal-bahai.el --- calendar functions for the Bahá'í calendar.
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: calendar
diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index 7a60fbfb334..bd10aa176ae 100644
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -1,7 +1,6 @@
 ;;; cal-html.el --- functions for printing HTML calendars
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Anna M. Bigatti <bigatti@dima.unige.it>
 ;; Keywords: calendar
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index a56fd4d2d0e..283c68cb32d 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -1,6 +1,7 @@
 ;;; cal-mayan.el --- calendar functions for the Mayan calendars
-;; Copyright (C) 1992-1993, 1995, 1997, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1992-1993, 1995, 1997, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index 7a32420767b..c13a9a0a73a 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -1,7 +1,6 @@
 ;;; cal-move.el --- calendar functions for movement in the calendar
-;; Copyright (C) 1995, 2001-2011
+;; Copyright (C) 1995, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index c9bc46c453e..a4e53670530 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1,7 +1,6 @@
 ;;; calendar.el --- calendar functions
-;; Copyright (C) 1988-1995, 1997, 2000-2011
+;; Copyright (C) 1988-1995, 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index c2c3a64323b..ca88548138b 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -1,7 +1,6 @@
 ;;; icalendar.el --- iCalendar implementation -*-coding: utf-8 -*-
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        August 2002
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index 7537a6497a1..e2ec46215be 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -1,6 +1,7 @@
 ;;; lunar.el --- calendar functions for phases of the moon
-;; Copyright (C) 1992-1993, 1995, 1997, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1992-1993, 1995, 1997, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 3f9fb58c7fe..31aed0484d7 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -1,6 +1,7 @@
 ;;; solar.el --- calendar functions for solar events
-;; Copyright (C) 1992-1993, 1995, 1997, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1992-1993, 1995, 1997, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;;         Denis B. Roegel <Denis.Roegel@loria.fr>
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index 06a01ad69fc..d2fb066515b 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -1,7 +1,6 @@
 ;;; cedet.el --- Setup CEDET environment
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: Eric M. Ludlam  <zappo@gnu.org>
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index 92fbcc74c2b..bd4a5a627a9 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -1,7 +1,6 @@
 ;;; ede/autoconf-edit.el --- Keymap for autoconf
-;; Copyright (C) 1998-2000, 2009-2011
+;; Copyright (C) 1998-2000, 2009-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project
diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 8336b5ab01b..b7a98271ff3 100644
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -1,7 +1,6 @@
 ;;; ede/dired.el --- EDE extensions to dired.
-;; Copyright (C) 1998-2000, 2003, 2009-2011
+;; Copyright (C) 1998-2000, 2003, 2009-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.4
diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el
index 68373627722..497806c71a3 100644
--- a/lisp/cedet/ede/pconf.el
+++ b/lisp/cedet/ede/pconf.el
@@ -1,7 +1,6 @@
 ;;; ede/pconf.el --- configure.ac maintenance for EDE
-;;; Copyright (C) 1998-2000, 2005, 2008-2011
+;;; Copyright (C) 1998-2000, 2005, 2008-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project
diff --git a/lisp/cedet/ede/proj-info.el b/lisp/cedet/ede/proj-info.el
index 1d5326e897c..d943e609528 100644
--- a/lisp/cedet/ede/proj-info.el
+++ b/lisp/cedet/ede/proj-info.el
@@ -1,7 +1,6 @@
 ;;; ede-proj-info.el --- EDE Generic Project texinfo support
-;;; Copyright (C) 1998-2001, 2004, 2007-2011
+;;; Copyright (C) 1998-2001, 2004, 2007-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index c132ace82e9..4d68e1544a7 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -1,7 +1,6 @@
 ;;; ede-proj-misc.el --- EDE Generic Project Emacs Lisp support
-;; Copyright (C) 1998-2001, 2008-2011
+;; Copyright (C) 1998-2001, 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index 34d7da07c21..7e7d289a59a 100644
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -1,7 +1,6 @@
 ;;; ede/proj-obj.el --- EDE Generic Project Object code generation support
-;;; Copyright (C) 1998-2000, 2005, 2008-2011
+;;; Copyright (C) 1998-2000, 2005, 2008-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff --git a/lisp/cedet/ede/proj-prog.el b/lisp/cedet/ede/proj-prog.el
index 4adc28369ab..f33f5327beb 100644
--- a/lisp/cedet/ede/proj-prog.el
+++ b/lisp/cedet/ede/proj-prog.el
@@ -1,7 +1,6 @@
 ;;; ede-proj-prog.el --- EDE Generic Project program support
-;; Copyright (C) 1998-2001, 2005, 2008-2011
+;; Copyright (C) 1998-2001, 2005, 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index ca866a23c17..40e6165251c 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -1,7 +1,6 @@
 ;;; ede/proj.el --- EDE Generic Project file driver
-;; Copyright (C) 1998-2003, 2007-2011
+;; Copyright (C) 1998-2003, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index 2626367faf0..252ce47df67 100644
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -1,6 +1,7 @@
 ;;; ede/speedbar.el --- Speedbar viewing of EDE projects
-;; Copyright (C) 1998-2001, 2003, 2005, 2007-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1998-2001, 2003, 2005, 2007-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make, tags
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el
index ce38b2fe6fa..71960ddecd4 100644
--- a/lisp/cedet/inversion.el
+++ b/lisp/cedet/inversion.el
@@ -1,7 +1,6 @@
 ;;; inversion.el --- When you need something in version XX.XX
-;;; Copyright (C) 2002-2003, 2005-2011
+;;; Copyright (C) 2002-2003, 2005-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 022b8268e1b..d077dd95f3c 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -1,7 +1,6 @@
 ;;; mode-local.el --- Support for mode local facilities
 ;;
-;; Copyright (C) 2004-2005, 2007-2011
+;; Copyright (C) 2004-2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index a52e0f9408b..8a0fbd5cc37 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -1,7 +1,6 @@
 ;;; semantic/analyze.el --- Analyze semantic tags against local context
-;; Copyright (C) 2000-2005, 2007-2011
+;; Copyright (C) 2000-2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/lisp/cedet/semantic/bovine/make-by.el b/lisp/cedet/semantic/bovine/make-by.el
index bff67643c59..3cc4e5b23a3 100644
--- a/lisp/cedet/semantic/bovine/make-by.el
+++ b/lisp/cedet/semantic/bovine/make-by.el
@@ -1,7 +1,6 @@
 ;;; semantic/bovine/make-by.el --- Generated parser support file
-;; Copyright (C) 1999-2004, 2008-2011
+;; Copyright (C) 1999-2004, 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/bovine/make.el b/lisp/cedet/semantic/bovine/make.el
index df04ef03b97..e132b48441a 100644
--- a/lisp/cedet/semantic/bovine/make.el
+++ b/lisp/cedet/semantic/bovine/make.el
@@ -1,7 +1,6 @@
 ;;; semantic/bovine/make.el --- Makefile parsing rules.
-;; Copyright (C) 2000-2004, 2008-2011
+;; Copyright (C) 2000-2004, 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/lisp/cedet/semantic/bovine/scm.el b/lisp/cedet/semantic/bovine/scm.el
index 8238bcbc6fd..0bdd8722db1 100644
--- a/lisp/cedet/semantic/bovine/scm.el
+++ b/lisp/cedet/semantic/bovine/scm.el
@@ -1,7 +1,6 @@
 ;;; semantic/bovine/scm.el --- Semantic details for Scheme (guile)
-;;; Copyright (C) 2001-2004, 2008-2011
+;;; Copyright (C) 2001-2004, 2008-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index aa15d1a6d9d..31e92724a00 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1,7 +1,6 @@
 ;;; semantic/complete.el --- Routines for performing tag completion
-;; Copyright (C) 2003-2005, 2007-2011
+;; Copyright (C) 2003-2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index 700456cf06a..d719fde3174 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -1,7 +1,6 @@
 ;;; semantic/db-ebrowse.el --- Semanticdb backend using ebrowse.
-;; Copyright (C) 2005-2011
+;; Copyright (C) 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors: Eric M. Ludlam <zappo@gnu.org>
 ;;      Joakim Verona
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 153b974d39f..0cbff54fd1d 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -1,7 +1,6 @@
 ;;; semantic/db-el.el --- Semantic database extensions for Emacs Lisp
-;;; Copyright (C) 2002-2011
+;;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 519ce346de3..661bc8d6841 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -1,7 +1,6 @@
 ;;; semantic/db-file.el --- Save a semanticdb to a cache file.
-;;; Copyright (C) 2000-2005, 2007-2011
+;;; Copyright (C) 2000-2005, 2007-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index 465038e6871..7f3d616203e 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -1,7 +1,6 @@
 ;;; semantic/db-global.el --- Semantic database extensions for GLOBAL
-;; Copyright (C) 2002-2006, 2008-2011
+;; Copyright (C) 2002-2006, 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el
index 55c7bc78bf9..213216cee1a 100644
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -1,7 +1,6 @@
 ;;; semantic/db-javascript.el --- Semantic database extensions for javascript
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Joakim Verona
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index 63ed48cad94..e5579d09113 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -1,7 +1,6 @@
 ;;; semantic/doc.el --- Routines for documentation strings
-;; Copyright (C) 1999-2003, 2005, 2008-2011
+;; Copyright (C) 1999-2003, 2005, 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index ab8e1872e13..a4361053174 100644
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -1,7 +1,6 @@
 ;;; semantic/ede-grammar.el --- EDE support for Semantic Grammar Files
-;; Copyright (C) 2003-2004, 2007-2011
+;; Copyright (C) 2003-2004, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index 4a94a8c2d64..c62ed818945 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -1,7 +1,6 @@
 ;;; semantic/find.el --- Search routines for Semantic
-;; Copyright (C) 1999-2005, 2008-2011
+;; Copyright (C) 1999-2005, 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 90789de4846..57067936a90 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -1,7 +1,6 @@
 ;;; semantic/ia-sb.el --- Speedbar analysis display interactor
-;;; Copyright (C) 2002-2004, 2006, 2008-2011
+;;; Copyright (C) 2002-2004, 2006, 2008-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index bc68ecaf388..f17a5471d75 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -1,7 +1,6 @@
 ;;; idle.el --- Schedule parsing tasks in idle time
-;; Copyright (C) 2003-2006, 2008-2011
+;; Copyright (C) 2003-2006, 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 8b12e3fe697..66327cbe2ff 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -1,7 +1,6 @@
 ;;; semantic/texi.el --- Semantic details for Texinfo files
-;; Copyright (C) 2001-2005, 2007-2011
+;; Copyright (C) 2001-2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index f0481a26e24..a08f4a31b30 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -1,7 +1,6 @@
 ;;; semantic/util-modes.el --- Semantic minor modes
-;; Copyright (C) 2000-2005, 2007-2011
+;; Copyright (C) 2000-2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors: Eric M. Ludlam <zappo@gnu.org>
 ;;          David Ponce <david@dponce.com>
diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el
index fadd6f84bae..04669b99660 100644
--- a/lisp/cedet/semantic/wisent.el
+++ b/lisp/cedet/semantic/wisent.el
@@ -1,7 +1,6 @@
 ;;; semantic/wisent.el --- Wisent - Semantic gateway
-;; Copyright (C) 2001-2007, 2009-2011
+;; Copyright (C) 2001-2007, 2009-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el
index 0d9304ae083..d0647d8e271 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -1,7 +1,6 @@
 ;;; semantic/wisent/java-tags.el --- Java LALR parser for Emacs
-;; Copyright (C) 2001-2006, 2009-2011
+;; Copyright (C) 2001-2006, 2009-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el
index 76c4efd6fbe..3a69078b02c 100644
--- a/lisp/cedet/semantic/wisent/python-wy.el
+++ b/lisp/cedet/semantic/wisent/python-wy.el
@@ -1,7 +1,6 @@
 ;;; semantic/wisent/python-wy.el --- Generated parser support file
-;; Copyright (C) 2002-2004, 2007, 2010-2011
+;; Copyright (C) 2002-2004, 2007, 2010-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index de8ca7f2dfe..095a817f08d 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -1,7 +1,6 @@
 ;;; wisent-python.el --- Semantic support for Python
-;; Copyright (C) 2002, 2004, 2006-2011
+;; Copyright (C) 2002, 2004, 2006-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Richard Kim  <emacs18@gmail.com>
 ;; Maintainer: Richard Kim  <emacs18@gmail.com>
diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el
index f37604c765e..8c17d4ccab4 100644
--- a/lisp/cedet/semantic/wisent/wisent.el
+++ b/lisp/cedet/semantic/wisent/wisent.el
@@ -1,7 +1,6 @@
 ;;; semantic/wisent/wisent.el --- GNU Bison for Emacs - Runtime
-;;; Copyright (C) 2002-2007, 2009-2011
+;;; Copyright (C) 2002-2007, 2009-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/lisp/completion.el b/lisp/completion.el
index 1c05f4ffd6b..128e3a2a489 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -1,6 +1,7 @@
 ;;; completion.el --- dynamic word-completion code
-;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: abbrev convenience
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 0a7a8f2f156..4ca4cec38ff 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,7 +1,6 @@
 ;;; desktop.el --- save partial status of Emacs when killed
-;; Copyright (C) 1993-1995, 1997, 2000-2011
+;; Copyright (C) 1993-1995, 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: convenience
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 5748c21afd1..312f49f6053 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -1,7 +1,6 @@
 ;;; dframe --- dedicate frame support modes
-;; Copyright (C) 1996-2011
+;; Copyright (C) 1996-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 876bdee3d0b..7a9043a6a0a 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -1,6 +1,7 @@
 ;;; disp-table.el --- functions for dealing with char tables
-;; Copyright (C) 1987, 1994-1995, 1999, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1994-1995, 1999, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Based on a previous version by Howard Gayle
diff --git a/lisp/dnd.el b/lisp/dnd.el
index decacae08d1..19b95016174 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -1,7 +1,6 @@
 ;;; dnd.el --- drag and drop support.  -*- coding: utf-8 -*-
-;; Copyright (C) 2005-2011
+;; Copyright (C) 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
 ;; Maintainer: FSF
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 3cbaa6d4c17..5f13555e472 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -1,6 +1,7 @@
 ;;; dos-fns.el --- MS-Dos specific functions
-;; Copyright (C) 1991, 1993, 1995-1996, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1993, 1995-1996, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: Morten Welinder <terra@diku.dk>
 ;; Keywords: internal
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 18e6d62f87c..7b610d11b0f 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1,7 +1,6 @@
 ;; autoload.el --- maintain autoloads in loaddefs.el
-;; Copyright (C) 1991-1997, 2001-2011
+;; Copyright (C) 1991-1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Keywords: maint
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index 84824455308..86063c512c6 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -1,7 +1,6 @@
 ;;; benchmark.el --- support for benchmarking code
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love  <fx@gnu.org>
 ;; Keywords: lisp, extensions
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 553e39ec67d..01eb1efdc3b 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -1,6 +1,7 @@
 ;;; chart.el --- Draw charts (bar charts, etc)
-;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam  <zappo@gnu.org>
 ;; Version: 0.2
diff --git a/lisp/emacs-lisp/eieio-comp.el b/lisp/emacs-lisp/eieio-comp.el
index c04295dcd58..ed6fb6f1c41 100644
--- a/lisp/emacs-lisp/eieio-comp.el
+++ b/lisp/emacs-lisp/eieio-comp.el
@@ -1,6 +1,7 @@
 ;;; eieio-comp.el -- eieio routines to help with byte compilation
-;; Copyright (C) 1995-1996, 1998-2002, 2005, 2008-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1995-1996, 1998-2002, 2005, 2008-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index 6e339ec83a8..6fe63fcb754 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -1,7 +1,6 @@
 ;;; eieio-custom.el -- eieio object customization
-;; Copyright (C) 1999-2001, 2005, 2007-2011
+;; Copyright (C) 1999-2001, 2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 1d35f7c21f7..ddc6616ba28 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -1,6 +1,7 @@
 ;;; eieio-opt.el -- eieio optional functions (debug, printing, speedbar)
-;; Copyright (C) 1996, 1998-2003, 2005, 2008-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1998-2003, 2005, 2008-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el
index d69a2ac63c1..d28ecd9615b 100644
--- a/lisp/emacs-lisp/eieio-speedbar.el
+++ b/lisp/emacs-lisp/eieio-speedbar.el
@@ -1,7 +1,6 @@
 ;;; eieio-speedbar.el -- Classes for managing speedbar displays.
-;; Copyright (C) 1999-2002, 2005, 2007-2011
+;; Copyright (C) 1999-2002, 2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.2
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 4d5c329713b..910eff3c78f 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -1,6 +1,7 @@
 ;;; elp.el --- Emacs Lisp Profiler
-;; Copyright (C) 1994-1995, 1997-1998, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 1997-1998, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Barry A. Warsaw
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 395b79acfb4..b91b96b83e5 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -1,7 +1,6 @@
 ;;;; testcover-ses.el -- Example use of `testcover' to test "SES"
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
 ;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index eaf199a38b5..6132b455faf 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -1,6 +1,7 @@
 ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards
-;; Copyright (C) 1986, 1992-1993, 1995, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1992-1993, 1995, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index 134dd19ec26..1dca1f19dfc 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -1,6 +1,7 @@
 ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals
-;; Copyright (C) 1986, 1992-1993, 1995, 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1992-1993, 1995, 2002-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 817dd1789e4..68550cc30e2 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -1,7 +1,6 @@
 ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs
-;; Copyright (C) 1986, 1992-1995, 2000-2011
+;; Copyright (C) 1986, 1992-1995, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 080a3da7585..328fbac9033 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -1,6 +1,7 @@
 ;;; vip.el --- a VI Package for GNU Emacs
-;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Masahiko Sato <ms@sail.stanford.edu>
 ;; Keywords: emulations
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index ea3252ac07f..4aace25fc9c 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,7 +1,6 @@
 ;;; viper-util.el --- Utilities used by viper.el
-;; Copyright (C) 1994-1997, 1999-2011
+;; Copyright (C) 1994-1997, 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: viper
diff --git a/lisp/epa.el b/lisp/epa.el
index 5a1136fef45..43e202c1b16 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -1,7 +1,6 @@
 ;;; epa.el --- the EasyPG Assistant
-;; Copyright (C) 2006-2011
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index d87ac80853a..a15e038dddc 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -1,7 +1,6 @@
 ;;; erc-autoaway.el --- Provides autoaway for ERC
-;; Copyright (C) 2002-2004, 2006-2011
+;; Copyright (C) 2002-2004, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index e9fd9738d23..792c8dd88b3 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -1,7 +1,6 @@
 ;;; erc-compat.el --- ERC compatibility code for XEmacs
-;; Copyright (C) 2002-2003, 2005-2011
+;; Copyright (C) 2002-2003, 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 1998cf6e8a8..88f0fe605f8 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1,6 +1,7 @@
 ;;; erc-dcc.el --- CTCP DCC module for ERC
-;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
 ;;         Noah Friedman <friedman@prep.ai.mit.edu>
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 8035e8386ac..b2cf9e35622 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -1,7 +1,6 @@
 ;; erc-goodies.el --- Collection of ERC modules
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 76c40114b42..9d658eec2f0 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -1,7 +1,6 @@
 ;;; erc-ibuffer.el --- ibuffer integration with ERC
-;; Copyright (C) 2002, 2004, 2006-2011
+;; Copyright (C) 2002, 2004, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index ff10b938efa..84a4c60816e 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -1,7 +1,6 @@
 ;;; erc-lang.el --- provide the LANG command to ERC
-;; Copyright (C) 2002, 2004, 2006-2011
+;; Copyright (C) 2002, 2004, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 35b287147e3..cfe8616ab65 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -1,7 +1,6 @@
 ;;; erc-stamp.el --- Timestamping for ERC messages
-;; Copyright (C) 2002-2004, 2006-2011
+;; Copyright (C) 2002-2004, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, timestamp
diff --git a/lisp/faces.el b/lisp/faces.el
index 13779062c6d..a9d26de604b 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1,7 +1,6 @@
 ;;; faces.el --- Lisp faces
-;; Copyright (C) 1992-1996, 1998-2011
+;; Copyright (C) 1992-1996, 1998-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/filesets.el b/lisp/filesets.el
index b205b5dfc3d..269ee331fb2 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1,7 +1,6 @@
 ;;; filesets.el --- handle group of files
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Thomas Link <sanobast-emacs@yahoo.de>
 ;; Maintainer: FSF
diff --git a/lisp/font-core.el b/lisp/font-core.el
index d862bfa34c3..fcaaf33b718 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -1,7 +1,6 @@
 ;;; font-core.el --- Core interface to font-lock
-;; Copyright (C) 1992-2011
+;; Copyright (C) 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: languages, faces
diff --git a/lisp/format.el b/lisp/format.el
index c507f194eeb..c5b48173e35 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -1,6 +1,7 @@
 ;;; format.el --- read and save files in multiple formats
-;; Copyright (C) 1994-1995, 1997, 1999, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 1997, 1999, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Package: emacs
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 47d08e8609f..cbaf4244e32 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -19214,8 +19214,7 @@
 See ChangeLog.2 for earlier changes.
-        Copyright (C) 2004-2011
+  Copyright (C) 2004-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index e2d4832d375..7448808b20f 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -3708,7 +3708,7 @@
        * gnus.el: Quassia Gnus v0.1 is released.
-        Copyright (C) 1997-2011 Free Software Foundation, Inc.
+  Copyright (C) 1997-2011 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -3724,4 +3724,3 @@
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index d2b111b7354..381ae544b24 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -18553,8 +18553,7 @@
 See ChangeLog.1 for earlier changes.
-        Copyright (C) 2000-2002, 2004-2011
+  Copyright (C) 2000-2002, 2004-2011  Free Software Foundation, Inc.
-      Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -18574,4 +18573,3 @@ See ChangeLog.1 for earlier changes.
 ;; Local Variables:
 ;; coding: iso-2022-7bit
 ;; End:
diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el
index 89c6122666f..1e2a566f72d 100644
--- a/lisp/gnus/deuglify.el
+++ b/lisp/gnus/deuglify.el
@@ -1,7 +1,6 @@
 ;;; deuglify.el --- deuglify broken Outlook (Express) articles
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Raymond Scholz <rscholz@zonix.de>
 ;;         Thomas Steffen
diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el
index d36360222b9..6a47b119f10 100644
--- a/lisp/gnus/ecomplete.el
+++ b/lisp/gnus/ecomplete.el
@@ -1,7 +1,6 @@
 ;;; ecomplete.el --- electric completion of addresses and the like
-;; Copyright (C) 2006-2011
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index f722e036f56..8deb27379a3 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -1,7 +1,6 @@
 ;;; gmm-utils.el --- Utility functions for Gnus, Message and MML
-;; Copyright (C) 2006-2011
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Reiner Steib <reiner.steib@gmx.de>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index 32477c7d78d..f86c94571a7 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -1,7 +1,6 @@
 ;;; gnus-bookmark.el --- Bookmarks in Gnus
-;; Copyright (C) 2006-2011
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index 12aa1e525c8..a06a510ecdd 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -1,7 +1,6 @@
 ;;; gnus-delay.el --- Delayed posting of articles
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Kai Gro�johann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;; Keywords: mail, news, extensions
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 890b97908a6..a058df76333 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1,7 +1,6 @@
 ;;; gnus-group.el --- group mode commands for Gnus
-;; Copyright (C) 1996-2011
+;; Copyright (C) 1996-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 930782a6def..08fef2327ad 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1,7 +1,6 @@
 ;;; gnus-msg.el --- mail and post interface for Gnus
-;; Copyright (C) 1995-2011
+;; Copyright (C) 1995-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;      Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 1c2cc680e83..d6aad539029 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -1,6 +1,7 @@
 ;;; gnus-uu.el --- extract (uu)encoded files in Gnus
-;; Copyright (C) 1985-1987, 1993-1998, 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1993-1998, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Created: 2 Oct 1993
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 74d09b1cdda..47b772b78dd 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1,6 +1,7 @@
 ;;; gnus.el --- a newsreader for GNU Emacs
-;; Copyright (C) 1987-1990, 1993-1998, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1987-1990, 1993-1998, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;      Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 6317261a7ab..498d0612519 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -1,7 +1,6 @@
 ;;; mm-url.el --- a wrapper of url functions/commands for Gnus
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 2a990d94177..20cdeb557de 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -1,6 +1,7 @@
 ;;; nnheader.el --- header access macros for Gnus and its backends
-;; Copyright (C) 1987-1990, 1993-1998, 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1987-1990, 1993-1998, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;      Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 8e0195443da..f7498cdf159 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1,7 +1,6 @@
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
-;; Copyright (C) 1995-2011
+;; Copyright (C) 1995-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 5510a07146f..b6b6449fc3f 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1,6 +1,7 @@
 ;;; nntp.el --- nntp access for Gnus
-;; Copyright (C) 1987-1990, 1992-1998, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1987-1990, 1992-1998, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 1b064db6019..95b5fb578f4 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -1,7 +1,6 @@
 ;;; spam-report.el --- Reporting spam
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: network, spam, mail, gmane, report
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index ec3212b96e5..2ebf0ba1e1d 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1,7 +1,6 @@
 ;;; spam.el --- Identifying spam
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index f597233c6e4..cafd7d07fde 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -1,6 +1,7 @@
 ;;; help-mode.el --- `help-mode' used by *Help* buffers
-;; Copyright (C) 1985-1986, 1993-1994, 1998-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1993-1994, 1998-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: help, internal
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 6a91b0bade8..d359bb0da86 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1,7 +1,6 @@
 ;;; htmlfontify.el --- htmlise a buffer/source tree with optional hyperlinks
-;; Copyright (C) 2002-2003, 2009-2011
+;; Copyright (C) 2002-2003, 2009-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Emacs Lisp Archive Entry
 ;; Package: htmlfontify
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 5347669d919..490b2b2ebfc 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -1,6 +1,7 @@
 ;;; icomplete.el --- minibuffer completion incremental feedback
-;; Copyright (C) 1992-1994, 1997, 1999, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1992-1994, 1997, 1999, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Ken Manheimer <klm@i.am>
 ;; Maintainer: Ken Manheimer <klm@i.am>
diff --git a/lisp/iimage.el b/lisp/iimage.el
index 3e6d509fe66..61347c5024c 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -1,7 +1,6 @@
 ;;; iimage.el --- Inline image minor mode.
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: KOSEKI Yoshinori <kose@meadowy.org>
 ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 34304dd1b32..c56db2c94bb 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -1,7 +1,6 @@
 ;;; info-xref.el --- check external references in an Info document
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Kevin Ryde <user42@zip.com.au>
 ;; Keywords: docs
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 4454adab8e6..455cbe697d6 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1,7 +1,6 @@
 ;;; characters.el --- set syntax and category for multibyte characters
-;; Copyright (C) 1997, 2000-2011
+;; Copyright (C) 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index c563bc02398..cb6856964c0 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -1,7 +1,6 @@
 ;;; isearch-x.el --- extended isearch handling commands
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index bf3260bad08..b0ca522dee4 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -1,7 +1,6 @@
 ;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index a510acc1dd2..1c9b06beab8 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -1,7 +1,6 @@
 ;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*-coding: iso-2022-7bit;-*-
-;; Copyright (C) 2000-2011
+;; Copyright (C) 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index fee6f87fe3f..4a387a233a0 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1,7 +1,6 @@
 ;;; mule.el --- basic commands for multilingual environment
-;; Copyright (C) 1997-2011
+;; Copyright (C) 1997-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el
index 1782e0b2bdd..f83e0f7588f 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -1,7 +1,6 @@
 ;;; ucs-normalize.el --- Unicode normalization NFC/NFD/NFKD/NFKC
-;; Copyright (C) 2009-2011
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Taichi Kawabata <kawabata.taichi@gmail.com>
 ;; Keywords: unicode, normalization
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 7b9cc80dac7..e27bf26e17d 100644
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -1,7 +1,6 @@
 ;;; utf-7.el --- utf-7 coding system
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n, mail
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 8ef8da18212..5aadac4a3b1 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1,7 +1,6 @@
 ;;; isearch.el --- incremental search minor mode
-;; Copyright (C) 1992-1997, 1999-2011
+;; Copyright (C) 1992-1997, 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 ;; Maintainer: FSF
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index 56cd9447069..721fce8ef9a 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -1,7 +1,6 @@
 ;;; isearchb --- a marriage between iswitchb and isearch
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index 198cd5ce680..fda9804bbb8 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -1,6 +1,7 @@
 ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el
-;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2011
+;;   Free Software Foundation, Inc.
 ;; Author: jka@ece.cmu.edu (Jay K. Adams)
 ;; Maintainer: FSF
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index fb702316f68..689120c0f8f 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -1,7 +1,6 @@
 ;;; kmacro.el --- enhanced keyboard macros
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index 10cfa8b800d..9f79dd087bb 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -1,7 +1,6 @@
 ;;; china-util.el --- utilities for Chinese  -*- coding: iso-2022-7bit -*-
-;; Copyright (C) 1995, 2001-2011
+;; Copyright (C) 1995, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index 8bb04514466..c44dc44581d 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -1,7 +1,6 @@
 ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 1b4b7bcad51..8fb7fae720d 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -1,7 +1,6 @@
 ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 1997-1998, 2001-2011
+;; Copyright (C) 1997-1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/czech.el b/lisp/language/czech.el
index 50ab19812db..2325699e30e 100644
--- a/lisp/language/czech.el
+++ b/lisp/language/czech.el
@@ -1,7 +1,6 @@
 ;;; czech.el --- support for Czech -*- coding: iso-2022-7bit; no-byte-compile: t -*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation.
 ;; Author: Milan Zamazal <pdm@zamazal.org>
 ;; Maintainer: Pavel Jan,Am(Bk <Pavel@Janik.cz>
diff --git a/lisp/language/english.el b/lisp/language/english.el
index c8da38b9928..dd96d38a197 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -1,7 +1,6 @@
 ;;; english.el --- support for English -*- no-byte-compile: t -*-
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 06f1b4e0260..bb242a50acc 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -1,7 +1,6 @@
 ;;; ethio-util.el --- utilities for Ethiopic    -*- coding: utf-8; -*-
-;; Copyright (C) 1997-1998, 2002-2011
+;; Copyright (C) 1997-1998, 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index f65a4e10b0a..22ccd56dab3 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -1,7 +1,6 @@
 ;;; ethiopic.el --- support for Ethiopic        -*- coding: utf-8-emacs; -*-
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el
index 226e36b4a9a..be6da8cba17 100644
--- a/lisp/language/georgian.el
+++ b/lisp/language/georgian.el
@@ -1,7 +1,6 @@
 ;;; georgian.el --- language support for Georgian -*- no-byte-compile: t -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index 30a027a6ea0..fd3e16b307a 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -1,7 +1,6 @@
 ;;; hebrew.el --- support for Hebrew -*- coding: utf-8 -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 8d23c88fcad..56893af1479 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -1,7 +1,6 @@
 ;;; ind-util.el --- Transliteration and Misc. Tools for Indian Languages -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: multilingual, Indian, Devanagari
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index d311d88024f..8203213d8eb 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -1,7 +1,6 @@
 ;;; indian.el --- Indian languages support -*- coding: utf-8; -*-
-;; Copyright (C) 1997, 1999, 2001-2011
+;; Copyright (C) 1997, 1999, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index ac21844e1c5..dcf3dc0f90e 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -1,7 +1,6 @@
 ;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index e0852a0a11b..bf8a4d8d5c2 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -1,7 +1,6 @@
 ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*-
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index 6dc0d406968..e2367cf0f7e 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -1,7 +1,6 @@
 ;;; korea-util.el --- utilities for Korean
-;; Copyright (C) 1997, 1999, 2001-2011
+;; Copyright (C) 1997, 1999, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 ;;   2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index b4111930063..acb9fea268d 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -1,7 +1,6 @@
 ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 3510a5d8ef4..81c5577fa57 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -1,7 +1,6 @@
 ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 ;;   2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index a775219387c..c09c6f8a0ef 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -1,7 +1,6 @@
 ;;; lao.el --- support for Lao -*- coding: utf-8; no-byte-compile: t -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 ;;   2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 952b639e84b..b9c250fd700 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -1,7 +1,6 @@
 ;;; romanian.el --- support for Romanian -*- coding: iso-latin-2; no-byte-compile: t -*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation.
 ;; Author:    Dan Nicolaescu <done@ece.arizona.edu>
 ;; Keywords: multilingual, Romanian, i18n
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index a4e35aa0e61..94aa5fdc94c 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -1,7 +1,6 @@
 ;;; slovak.el --- support for Slovak -*- coding: iso-2022-7bit; no-byte-compile: t -*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation.
 ;; Authors:    Tibor ,B)(Bimko <tibor.simko@fmph.uniba.sk>,
 ;;             Milan Zamazal <pdm@zamazal.org>
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 2db3c64770b..8458974e753 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -1,7 +1,6 @@
 ;;; tibet-util.el --- utilities for Tibetan   -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el
index 939dc9cba23..dd840772218 100644
--- a/lisp/language/utf-8-lang.el
+++ b/lisp/language/utf-8-lang.el
@@ -1,7 +1,6 @@
 ;;; utf-8-lang.el --- generic UTF-8 language environment -*- no-byte-compile: t -*-
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index 654ccafb7f6..ea601c041e4 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -1,7 +1,6 @@
 ;;; viet-util.el --- utilities for Vietnamese  -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index e0f92cba909..97d5037f3c5 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -1,7 +1,6 @@
 ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*-
-;; Copyright (C) 1998, 2001-2011
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index be45413f9ae..b884adb5b1e 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,6 +1,7 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
-;; Copyright (C) 1985-1986, 1992, 1994, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1992, 1994, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/lpr.el b/lisp/lpr.el
index cf6f5af1965..709f992b2b8 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -1,6 +1,7 @@
 ;;; lpr.el --- print Emacs buffer on line printer
-;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: unix
diff --git a/lisp/macros.el b/lisp/macros.el
index a8e62846668..b4f38b7db84 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,6 +1,7 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
-;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: abbrev
diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el
index 735ff839b66..8343cd086b1 100644
--- a/lisp/mail/hashcash.el
+++ b/lisp/mail/hashcash.el
@@ -1,7 +1,6 @@
 ;;; hashcash.el --- Add hashcash payments to email
-;; Copyright (C) 2003-2005, 2007-2011
+;; Copyright (C) 2003-2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation
 ;; Written by: Paul Foley <mycroft@actrix.gen.nz> (1997-2002)
 ;; Maintainer: Paul Foley <mycroft@actrix.gen.nz>
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 43f38f697dd..c3a7da41823 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,7 +1,6 @@
 ;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*-
-;; Copyright (C) 1991-1994, 1997, 2001-2011
+;; Copyright (C) 1991-1994, 1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Joe Wells <jbw@cs.bu.edu>
 ;; Maintainer: FSF
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index ac50a870ebc..70226b26965 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -1,7 +1,6 @@
 ;;; rmail-spam-filter.el --- spam filter for Rmail, the Emacs mail reader
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Keywords: email, spam, filter, rmail
 ;; Author: Eli Tziperman <eli AT deas.harvard.edu>
 ;; Package: rmail
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 10b1c9bbfc8..3926b426a67 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -1,6 +1,7 @@
 ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file
-;; Copyright (C) 1985, 1987, 1993-1994, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1993-1994, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 9720c0b4596..04bb320a2ab 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -1,6 +1,7 @@
 ;;; undigest.el --- digest-cracking support for the RMAIL mail reader
-;; Copyright (C) 1985-1986, 1994, 1996, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1994, 1996, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/man.el b/lisp/man.el
index c89cc7ba5d5..0b3ac537c5b 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,6 +1,7 @@
 ;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
-;; Copyright (C) 1993-1994, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 1996-1997, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Maintainer: FSF
diff --git a/lisp/master.el b/lisp/master.el
index 0177a380235..1ea0a24ca94 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -1,7 +1,6 @@
 ;;; master.el --- make a buffer the master over another buffer
-;; Copyright (C) 1999-2011
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 1e9cfdec603..2abfea9ac6b 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -11400,8 +11400,7 @@
        (dist): Leave release in current directory.
-        Copyright (C) 2003-2011
+  Copyright (C) 2003-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -11417,4 +11416,3 @@
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 35c0402c294..c1964d5a4ea 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -1,7 +1,6 @@
 ;;; mh-acros.el --- macros used in MH-E
-;; Copyright (C) 2004, 2006-2011
+;; Copyright (C) 2004, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 194da98861f..061a5b3dc94 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -1,7 +1,6 @@
 ;;; mh-alias.el --- MH-E mail alias completion and expansion
-;; Copyright (C) 1994-1997, 2001-2011
+;; Copyright (C) 1994-1997, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el
index 6edcc25d15c..48154cbf4e0 100644
--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@@ -1,7 +1,6 @@
 ;;; mh-buffers.el --- MH-E buffer constants and utilities
-;; Copyright (C) 1993, 1995, 1997, 2000-2011
+;; Copyright (C) 1993, 1995, 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 0ea670a8e45..169679e88ae 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1,7 +1,6 @@
 ;;; mh-comp.el --- MH-E functions for composing and sending messages
-;; Copyright (C) 1993, 1995, 1997, 2000-2011
+;; Copyright (C) 1993, 1995, 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 7e7958ff449..01a0f26b9e8 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -1,7 +1,6 @@
 ;;; mh-compat.el --- make MH-E compatibile with various versions of Emacs
-;; Copyright (C) 2006-2011
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 53a9851b85d..aab40c7be13 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -1,7 +1,6 @@
 ;;; mh-folder.el --- MH-Folder mode
-;; Copyright (C) 2002-2003, 2005-2011
+;; Copyright (C) 2002-2003, 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 4447088697c..ad508416501 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -1,7 +1,6 @@
 ;;; mh-funcs.el --- MH-E functions not everyone will use right away
-;; Copyright (C) 1993, 1995, 2001-2011
+;; Copyright (C) 1993, 1995, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 403d20a5829..f644282fc82 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -1,7 +1,6 @@
 ;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus
-;; Copyright (C) 2003-2004, 2006-2011
+;; Copyright (C) 2003-2004, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 77c4a0beda7..7e8b8576ff1 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -1,7 +1,6 @@
 ;;; mh-identity.el --- multiple identify support for MH-E
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index 42fec533148..4f83ed70508 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -1,7 +1,6 @@
 ;;; mh-inc.el --- MH-E "inc" and separate mail spool handling
-;; Copyright (C) 2003-2004, 2006-2011
+;; Copyright (C) 2003-2004, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 772faa0aa71..2ffc24e26e8 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -1,7 +1,6 @@
 ;;; mh-junk.el --- MH-E interface to anti-spam measures
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 23faba9a81a..eebc30aa4ca 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -1,7 +1,6 @@
 ;;; mh-letter.el --- MH-Letter mode
-;; Copyright (C) 1993, 1995, 1997, 2000-2011
+;; Copyright (C) 1993, 1995, 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el
index 59bbb1da77f..db17b05ef37 100644
--- a/lisp/mh-e/mh-limit.el
+++ b/lisp/mh-e/mh-limit.el
@@ -1,7 +1,6 @@
 ;;; mh-limit.el --- MH-E display limits
-;; Copyright (C) 2001-2003, 2006-2011
+;; Copyright (C) 2001-2003, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index cbcd02452e9..bd99245efe6 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -1,7 +1,6 @@
 ;;; mh-print.el --- MH-E printing support
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jeffrey C Honig <jch@honig.net>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index 5b82fc5b929..656bcb65011 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -1,7 +1,6 @@
 ;;; mh-scan.el --- MH-E scan line constants and utilities
-;; Copyright (C) 1993, 1995, 1997, 2000-2011
+;; Copyright (C) 1993, 1995, 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index bf249f3032b..a90a26ab2a4 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1,7 +1,6 @@
 ;;; mh-search  ---  MH-Search mode
-;; Copyright (C) 1993, 1995, 2001-2011
+;; Copyright (C) 1993, 1995, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Indexed search by Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 0489635ffa5..5c2f08cefe5 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -1,7 +1,6 @@
 ;;; mh-show.el --- MH-Show mode
-;; Copyright (C) 1993, 1995, 1997, 2000-2011
+;; Copyright (C) 1993, 1995, 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index ae0eb5f7664..b782081c85c 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -1,7 +1,6 @@
 ;;; mh-speed.el --- MH-E speedbar support
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index 5dcb334e1a1..c6f33a15fd2 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -1,7 +1,6 @@
 ;;; mh-thread.el --- MH-E threading support
-;; Copyright (C) 2002-2004, 2006-2011
+;; Copyright (C) 2002-2004, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index 074b0236c85..ddc9b3ffe94 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -1,7 +1,6 @@
 ;;; mh-tool-bar.el --- MH-E tool bar support
-;; Copyright (C) 2002-2003, 2005-2011
+;; Copyright (C) 2002-2003, 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 43eabbf86c1..d7d3107b908 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1,7 +1,6 @@
 ;;; mh-utils.el --- MH-E general utilities
-;; Copyright (C) 1993, 1995, 1997, 2000-2011
+;; Copyright (C) 1993, 1995, 1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index cd64f0fd9ac..027d79a948a 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -1,7 +1,6 @@
 ;;; mh-xface.el --- MH-E X-Face and Face header field display
-;; Copyright (C) 2002-2003, 2005-2011
+;; Copyright (C) 2002-2003, 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index fcaf5da6326..f0d36451b5c 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1,7 +1,6 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
-;; Copyright (C) 1989-1996, 1998, 2000-2011
+;; Copyright (C) 1989-1996, 1998, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
 ;; Maintainer: FSF
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index f87ef5edc9a..660eb3b968e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1,7 +1,6 @@
 ;;; browse-url.el --- pass a URL to a WWW browser
-;; Copyright (C) 1995-2011
+;; Copyright (C) 1995-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
 ;; Maintainer: FSF
diff --git a/lisp/net/dns.el b/lisp/net/dns.el
index 4469a544c3c..77a194ec436 100644
--- a/lisp/net/dns.el
+++ b/lisp/net/dns.el
@@ -1,7 +1,6 @@
 ;;; dns.el --- Domain Name Service lookups
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: network comm
diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el
index c7f6bbd8a74..485ca5a0c06 100644
--- a/lisp/net/eudcb-mab.el
+++ b/lisp/net/eudcb-mab.el
@@ -1,7 +1,6 @@
 ;;; eudcb-mab.el --- Emacs Unified Directory Client - AddressBook backend
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: FSF
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 16600ac6b0f..039d709770e 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -1,7 +1,6 @@
 ;;; newst-backend.el --- Retrieval backend for newsticker.
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-backend.el
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 2cb396a5267..0e1279cd86c 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -1,7 +1,6 @@
 ;;; newst-plainview.el --- Single buffer frontend for newsticker.
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-plainview.el
diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index 237a58a42cc..dd076bcf4f0 100644
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -1,7 +1,6 @@
 ;;; newst-reader.el --- Generic RSS reader functions.
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-reader.el
diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el
index 5a49c77f44f..cb82bb74048 100644
--- a/lisp/net/newst-ticker.el
+++ b/lisp/net/newst-ticker.el
@@ -1,7 +1,6 @@
 ;; newst-ticker.el --- modeline ticker for newsticker.
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-ticker.el
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index 2830ea68356..3a2cf3f04f7 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -1,7 +1,6 @@
 ;;; newsticker.el --- A Newsticker for Emacs.
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newsticker.el
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 618c3c6bd3a..60efa9dd3ee 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1,7 +1,6 @@
 ;;; rcirc.el --- default, simple IRC client.
-;; Copyright (C) 2005-2011
+;; Copyright (C) 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Ryan Yeske <rcyeske@gmail.com>
 ;; Maintainers: Ryan Yeske <rcyeske@gmail.com>,
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index 7103b551116..d4850fed345 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -1,6 +1,7 @@
 ;;; telnet.el --- run a telnet session from within an Emacs buffer
-;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: William F. Schelter
 ;; Maintainer: FSF
diff --git a/lisp/nxml/nxml-maint.el b/lisp/nxml/nxml-maint.el
index 51ca453eba3..e24a3d7172a 100644
--- a/lisp/nxml/nxml-maint.el
+++ b/lisp/nxml/nxml-maint.el
@@ -1,7 +1,6 @@
 ;;; nxml-maint.el --- commands for maintainers of nxml-*.el
-;; Copyright (C) 2003, 2007-2011
+;; Copyright (C) 2003, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: James Clark
 ;; Keywords: XML
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index d41fc714ff7..993a6f7a2ab 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1,7 +1,6 @@
 ;;; nxml-mode.el --- a new XML mode
-;; Copyright (C) 2003-2004, 2007-2011
+;; Copyright (C) 2003-2004, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: James Clark
 ;; Keywords: XML
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index 2ade0a5c64c..6a2a9daf7e4 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -1,7 +1,6 @@
 ;;; nxml-outln.el --- outline support for nXML mode
-;; Copyright (C) 2004, 2007-2011
+;; Copyright (C) 2004, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: James Clark
 ;; Keywords: XML
diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el
index 4fa5a808a06..b9e31e0a09e 100644
--- a/lisp/nxml/rng-loc.el
+++ b/lisp/nxml/rng-loc.el
@@ -1,7 +1,6 @@
 ;;; rng-loc.el --- locate the schema to use for validation
-;; Copyright (C) 2003, 2007-2011
+;; Copyright (C) 2003, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: James Clark
 ;; Keywords: XML, RelaxNG
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el
index 8e0aca98250..1686ebfc514 100644
--- a/lisp/nxml/rng-nxml.el
+++ b/lisp/nxml/rng-nxml.el
@@ -1,7 +1,6 @@
 ;;; rng-nxml.el --- make nxml-mode take advantage of rng-validate-mode
-;; Copyright (C) 2003, 2007-2011
+;; Copyright (C) 2003, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: James Clark
 ;; Keywords: XML, RelaxNG
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 77d36293905..876e582ed21 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -1,7 +1,6 @@
 ;;; rng-valid.el --- real-time validation of XML using RELAX NG
-;; Copyright (C) 2003, 2007-2011
+;; Copyright (C) 2003, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: James Clark
 ;; Keywords: XML, RelaxNG
diff --git a/lisp/obsolete/swedish.el b/lisp/obsolete/swedish.el
index 3544126b274..4b82a74bce7 100644
--- a/lisp/obsolete/swedish.el
+++ b/lisp/obsolete/swedish.el
@@ -1,7 +1,6 @@
 ;;; swedish.el --- miscellaneous functions for dealing with Swedish
-;; Copyright (C) 1988, 2001-2011
+;; Copyright (C) 1988, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/vc-mcvs.el b/lisp/obsolete/vc-mcvs.el
index 554bd5f6a4a..06ce7f41c65 100644
--- a/lisp/obsolete/vc-mcvs.el
+++ b/lisp/obsolete/vc-mcvs.el
@@ -1,7 +1,6 @@
 ;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  None
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index b054dc18e18..9adc180b28e 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1,7 +1,6 @@
 ;;; org-agenda.el --- Dynamic task and appointment lists for Org
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index 73b1a3e0386..4a934517cfe 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -1,7 +1,6 @@
 ;;; org-archive.el --- Archiving for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-ascii.el b/lisp/org/org-ascii.el
index 97800335982..d5964538a9c 100644
--- a/lisp/org/org-ascii.el
+++ b/lisp/org/org-ascii.el
@@ -1,7 +1,6 @@
 ;;; org-ascii.el --- ASCII export for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index 78ae5551ca7..49393db4304 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -1,7 +1,6 @@
 ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 568c40545d1..4e30dd90d80 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1,7 +1,6 @@
 ;;; org-clock.el --- The time clocking code for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 9a1eec8d8ad..35a23052e8a 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -1,7 +1,6 @@
 ;;; org-colview.el --- Column View in Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 07d81859c40..efe54c568b3 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -1,7 +1,6 @@
 ;;; org-compat.el --- Compatibility code for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-complete.el b/lisp/org/org-complete.el
index b8490cca725..07c1ba2e4f2 100644
--- a/lisp/org/org-complete.el
+++ b/lisp/org/org-complete.el
@@ -1,7 +1,6 @@
 ;;; org-complete.el --- In-buffer completion code
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         John Wiegley <johnw at gnu dot org>
diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index ae52fc86029..f5b635838fe 100644
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -1,7 +1,6 @@
 ;;; org-exp-blocks.el --- pre-process blocks when exporting org files
-;; Copyright (C) 2009-2011
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric Schulte
 ;; Version: 7.4
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index 126a2c86609..002ad025fbe 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -1,7 +1,6 @@
 ;;; org-exp.el --- ASCII, HTML, XOXO and iCalendar export for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index e7456a7f19e..e5877768fe7 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -1,7 +1,6 @@
 ;;; org-faces.el --- Face definitions for Org-mode.
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index 8593bb40f3d..e8424a1e5cd 100644
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -1,7 +1,6 @@
 ;;; org-gnus.el --- Support for links to Gnus groups and messages from within Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index b4bbb94fcd1..a6933978710 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -1,7 +1,6 @@
 ;;; org-html.el --- HTML export for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index 52b7f79b4c1..e0ea20a4bb8 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -1,7 +1,6 @@
 ;;; org-icalendar.el --- iCalendar export for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index 654a4397caa..edbf4268954 100644
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -1,7 +1,6 @@
 ;;; org-info.el --- Support for links to Info nodes from within Org-Mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-install.el b/lisp/org/org-install.el
index df5d61aabdf..eb2d011efb9 100644
--- a/lisp/org/org-install.el
+++ b/lisp/org/org-install.el
@@ -1,7 +1,6 @@
 ;;; org-install.el --- Outline-based notes management and organizer
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index 484f6fd6c24..1db4860b20d 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -1,7 +1,6 @@
 ;;; org-jsinfo.el --- Support for org-info.js Javascript in Org HTML export
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 6f3526224f3..08c733acc6f 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -1,7 +1,6 @@
 ;;; org-list.el --- Plain lists for Org-mode
 ;;
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Bastien Guerry <bzg AT altern DOT org>
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 73766822020..5bb86888739 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -1,7 +1,6 @@
 ;;; org-macs.el --- Top-level definitions for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index ce01daafbc1..1767ddca1ee 100644
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -1,7 +1,6 @@
 ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 96d9dc36b30..018eadf9a23 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -1,7 +1,6 @@
 ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions.
 ;;
-;; Copyright (C) 2008-2011
+;; Copyright (C) 2008-2011  Free Software Foundation, Inc.
-;;          Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Author: Daniel M German <dmg AT uvic DOT org>
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 1c2e6d28a19..7451587ba2f 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -1,6 +1,5 @@
 ;;; org-publish.el --- publish related org-mode files as a website
-;; Copyright (C) 2006-2011
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
-;;          Free Software Foundation, Inc.
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index ca5e206131d..80f9dadd7a4 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1,7 +1,6 @@
 ;;; org-remember.el --- Fast note taking in Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index 791f5840f83..6e984fda687 100644
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -1,7 +1,6 @@
 ;;; org-rmail.el --- Support for links to Rmail messages from within Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 2ea58a02049..07779700da8 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -1,7 +1,6 @@
 ;;; org-src.el --- Source code examples in Org
 ;;
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Bastien Guerry <bzg AT altern DOT org>
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 3d87e66b3e7..c99b5bf681a 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -1,7 +1,6 @@
 ;;; org-table.el --- The table editor for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index cdeae005e81..7ebeadbc4d9 100644
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -1,7 +1,6 @@
 ;;; org-vm.el --- Support for links to VM messages from within Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index c2d67793ef9..2a16d047b33 100644
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -1,7 +1,6 @@
 ;;; org-wl.el --- Support for links to Wanderlust messages from within Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;;         David Maus <dmaus at ictsoc dot de>
diff --git a/lisp/org/org-xoxo.el b/lisp/org/org-xoxo.el
index 0969f58bf9f..39a4cc7a447 100644
--- a/lisp/org/org-xoxo.el
+++ b/lisp/org/org-xoxo.el
@@ -1,7 +1,6 @@
 ;;; org-xoxo.el --- XOXO export for Org-mode
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 7d391e91036..8f1ef9e5d60 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1,7 +1,6 @@
 ;;; org.el --- Outline-based notes management and organizer
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 5cebf892029..5b3b4aba0fe 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -1,6 +1,7 @@
 ;;; doctor.el --- psychological help for frustrated users
-;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1987, 1994, 1996, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: games
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 709acf6aae2..beb737ba613 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1,7 +1,6 @@
 ;;; ada-mode.el --- major-mode for editing Ada sources
-;; Copyright (C) 1994-1995, 1997-2011
+;; Copyright (C) 1994-1995, 1997-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Rolf Ebert      <ebert@inf.enst.fr>
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index b4232bc08b8..e48055c9f50 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -1,7 +1,6 @@
 ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates
-;; Copyright (C) 1987, 1993-1994, 1996-2011
+;; Copyright (C) 1987, 1993-1994, 1996-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors: Daniel Pfeiffer
 ;;      Markus Heritsch
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index d81fa2e5a6e..85659cafd95 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1,7 +1,6 @@
 ;; ada-xref.el --- for lookup and completion in Ada mode
-;; Copyright (C) 1994-2011
+;; Copyright (C) 1994-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Rolf Ebert <ebert@inf.enst.fr>
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index bc0275f5ecb..9d79d22d42e 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -1,7 +1,6 @@
 ;;; asm-mode.el --- mode for editing assembler code
-;; Copyright (C) 1991, 2001-2011
+;; Copyright (C) 1991, 2001-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index 887f918db97..3aa9a6cfb87 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -1,7 +1,6 @@
 ;;; autoconf.el --- mode for editing Autoconf configure.in files
-;; Copyright (C) 2000-2011
+;; Copyright (C) 2000-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
diff --git a/lisp/progmodes/cap-words.el b/lisp/progmodes/cap-words.el
index 43699101d79..0ce84ae33a7 100644
--- a/lisp/progmodes/cap-words.el
+++ b/lisp/progmodes/cap-words.el
@@ -1,7 +1,6 @@
 ;;; cap-words.el --- minor mode for motion in CapitalizedWordIdentifiers
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index ebebfa67845..81045d63abf 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -1,7 +1,6 @@
 ;;; cc-align.el --- custom indentation functions for CC Mode
-;; Copyright (C) 1985, 1987, 1992-2011
+;; Copyright (C) 1985, 1987, 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:    2004- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 0df17b4641f..823430f2d38 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -1,7 +1,6 @@
 ;;; cc-bytecomp.el --- compile time setup for proper compilation
-;; Copyright (C) 2000-2011
+;; Copyright (C) 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:     Martin Stjernholm
 ;; Maintainer: bug-cc-mode@gnu.org
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index f1c00ddbd4b..327ebea40cc 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1,7 +1,6 @@
 ;;; cc-cmds.el --- user level commands for CC Mode
-;; Copyright (C) 1985, 1987, 1992-2011
+;; Copyright (C) 1985, 1987, 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el
index 7a3d89e6598..01f7379b1b0 100644
--- a/lisp/progmodes/cc-compat.el
+++ b/lisp/progmodes/cc-compat.el
@@ -1,7 +1,6 @@
 ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
-;; Copyright (C) 1985, 1987, 1992-2011
+;; Copyright (C) 1985, 1987, 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:    1998- Martin Stjernholm
 ;;             1994-1999 Barry A. Warsaw
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index 8d5d4b39276..ce38cf8850b 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -1,7 +1,6 @@
 ;;; cc-defs.el --- compile time definitions for CC Mode
-;; Copyright (C) 1985, 1987, 1992-2011
+;; Copyright (C) 1985, 1987, 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index d06a3ae440b..86a963bcf55 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1,7 +1,6 @@
 ;;; cc-langs.el --- language specific settings for CC Mode
-;; Copyright (C) 1985, 1987, 1992-2011
+;; Copyright (C) 1985, 1987, 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:    2002- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index 36b1cb09957..f53a7da5186 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -1,7 +1,6 @@
 ;;; cc-menus.el --- imenu support for CC Mode
-;; Copyright (C) 1985, 1987, 1992-2011
+;; Copyright (C) 1985, 1987, 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index abc413f4d88..e161eb6d0f5 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -1,7 +1,6 @@
 ;;; cc-styles.el --- support for styles in CC Mode
-;; Copyright (C) 1985, 1987, 1992-2011
+;; Copyright (C) 1985, 1987, 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:    2004- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index b28c0b0f09c..d2a5d117635 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1,7 +1,6 @@
 ;;; cc-vars.el --- user customization variables for CC Mode
-;; Copyright (C) 1985, 1987, 1992-2011
+;; Copyright (C) 1985, 1987, 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:    2002- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 9e979634d02..a475bbd5932 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -1,7 +1,6 @@
 ;;; cfengine.el --- mode for editing Cfengine files
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: languages
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index a9d9b1adc4a..d7b8b0e8748 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -1,7 +1,6 @@
 ;;; cpp.el --- highlight or hide text according to cpp conditionals
-;; Copyright (C) 1994-1995, 2001-2011
+;; Copyright (C) 1994-1995, 2001-2011  Free Software Foundation, Inc.
-;; Free Software Foundation
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: c, faces, tools
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index bc006d2e062..211c856f9b7 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -1,7 +1,6 @@
 ;;; cwarn.el --- highlight suspicious C and C++ constructions
-;; Copyright (C) 1999-2011
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Anders Lindgren <andersl@andersl.com>
 ;; Keywords: c, languages, faces
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index bb066419390..b45a47f8a3f 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -1,7 +1,6 @@
 ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF)
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index 5332e0d76f9..cb8ebf8aab0 100644
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@@ -1,7 +1,6 @@
 ;;; ebnf-bnf.el --- parser for EBNF
-;; Copyright (C) 1999-2011
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index a167b2d2b4d..204b6a91b0f 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -1,7 +1,6 @@
 ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML)
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index a210186e3d1..7d697e889b7 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -1,7 +1,6 @@
 ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX)
-;; Copyright (C) 2001-2011
+;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index a63ec36b1c1..d33167093a3 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -1,7 +1,6 @@
 ;;; ebnf-iso.el --- parser for ISO EBNF
-;; Copyright (C) 1999-2011
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index e72e3aef650..0392505972d 100644
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@@ -1,7 +1,6 @@
 ;;; ebnf-otz.el --- syntactic chart OpTimiZer
-;; Copyright (C) 1999-2011
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 20c3cd786c0..5ff239bfa21 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -1,7 +1,6 @@
 ;;; ebnf-yac.el --- parser for Yacc/Bison
-;; Copyright (C) 1999-2011
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 6bef1a10155..d674484345a 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1,7 +1,6 @@
 ;;; ebrowse.el --- Emacs C++ class browser & tags facility
-;; Copyright (C) 1992-2011
+;; Copyright (C) 1992-2011  Free Software Foundation, Inc.
-;; Free Software Foundation Inc.
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 3e017795cee..d22d03fbe96 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1,6 +1,7 @@
 ;;; etags.el --- etags facility for Emacs
-;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1988-1989, 1992-1996, 1998, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index a6059b1b69f..4461ec27456 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1,7 +1,6 @@
 ;;; flymake.el -- a universal on-the-fly syntax checker
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:  Pavel Kobyakov <pk_at_work@yahoo.com>
 ;; Maintainer: Pavel Kobyakov <pk_at_work@yahoo.com>
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 28928b440c2..67a214977b1 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1,7 +1,6 @@
 ;;; fortran.el --- Fortran mode for GNU Emacs
-;; Copyright (C) 1986, 1993-1995, 1997-2011
+;; Copyright (C) 1986, 1993-1995, 1997-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index da4a23fac5a..a1dc19da1ed 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -1,7 +1,6 @@
 ;;; glasses.el --- make cantReadThis readable
-;; Copyright (C) 1999-2011
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Milan Zamazal <pdm@zamazal.org>
 ;; Maintainer: Milan Zamazal <pdm@zamazal.org>
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index 72836cd85e1..d4eddee9722 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -1,7 +1,6 @@
 ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE
-;; Copyright (C) 1999-2011
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 5391c8d9091..e4e56054f9d 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -1,7 +1,6 @@
 ;;; inf-lisp.el --- an inferior-lisp mode
-;; Copyright (C) 1988, 1993-1994, 2001-2011
+;; Copyright (C) 1988, 1993-1994, 2001-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;; Keywords: processes, lisp
diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el
index 6a8803f1f26..98df1c69468 100644
--- a/lisp/progmodes/m4-mode.el
+++ b/lisp/progmodes/m4-mode.el
@@ -1,7 +1,6 @@
 ;;; m4-mode.el --- m4 code editing commands for Emacs
-;; Copyright (C) 1996-1997, 2001-2011
+;; Copyright (C) 1996-1997, 2001-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Andrew Csillag <drew_csillag@geocities.com>
 ;; Maintainer: Andrew Csillag <drew_csillag@geocities.com>
diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el
index 016028b8754..c8963d2a6dd 100644
--- a/lisp/progmodes/mantemp.el
+++ b/lisp/progmodes/mantemp.el
@@ -1,7 +1,6 @@
 ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output
-;; Copyright (C) 1996, 2001-2011
+;; Copyright (C) 1996, 2001-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Tom Houlder <thoulder@icor.fr>
 ;; Created: 10 Dec 1996
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index b6baab4aba2..bf5662cdfa3 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1,7 +1,6 @@
 ;;; mixal-mode.el --- Major mode for the mix asm language.
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Pieter E.J. Pareit <pieter.pareit@gmail.com>
 ;; Maintainer: Pieter E.J. Pareit <pieter.pareit@gmail.com>
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index bfa567a2382..e1d41c2ebd6 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -1,7 +1,6 @@
 ;;; octave-inf.el --- running Octave as an inferior Emacs process
-;; Copyright (C) 1997, 2001-2011
+;; Copyright (C) 1997, 2001-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
 ;; Author: John Eaton <jwe@bevo.che.wisc.edu>
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 1af527c2c42..2a243a99ffc 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1,7 +1,6 @@
 ;;; pascal.el --- major mode for editing pascal source in Emacs
-;; Copyright (C) 1993-2011
+;; Copyright (C) 1993-2011  Free Software Foundation, Inc.
-;;               Free Software Foundation, Inc.
 ;; Author: Espen Skoglund <esk@gnu.org>
 ;; Keywords: languages
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index 870881b0696..f3418a60729 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -1,7 +1,6 @@
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
-;; Copyright (C) 1999, 2001-2011
+;; Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
-;; Free Software Foundation, Inc.
 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 ;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl>
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b374119ee80..4246177495c 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1,7 +1,6 @@
 ;;; python.el --- silly walks for Python  -*- coding: iso-8859-1 -*-
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index eee158880d9..1c71fc68bfe 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1,7 +1,6 @@
 ;;; ruby-mode.el --- Major mode for editing Ruby files
-;; Copyright (C) 1994-2011
+;; Copyright (C) 1994-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors: Yukihiro Matsumoto
 ;;      Nobuyoshi Nakada
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 266b3b0e16c..4151e2bb79a 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -1,6 +1,7 @@
 ;;; scheme.el --- Scheme (and DSSSL) editing mode
-;; Copyright (C) 1986-1988, 1997-1998, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1986-1988, 1997-1998, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Bill Rozas <jinx@martigny.ai.mit.edu>
 ;; Adapted-by: Dave Love <d.love@dl.ac.uk>
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e36d8a9aaf4..64f8c623779 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,7 +1,6 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs
-;; Copyright (C) 1993-1997, 1999, 2001-2011
+;; Copyright (C) 1993-1997, 1999, 2001-2011  Free Software Foundation, Inc.
-;;  Free Software Foundation, Inc.
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Version: 2.0f
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index a69265acd73..cb1d3c24a94 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -1,7 +1,6 @@
 ;;; vhdl-mode.el --- major mode for editing VHDL code
-;; Copyright (C) 1992-2011
+;; Copyright (C) 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors:     Reto Zimmermann <reto@gnu.org>
 ;;              Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index d7cdd18f3f5..cd50174f8cd 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -1,6 +1,7 @@
 ;;; xscheme.el --- run MIT Scheme under Emacs
-;; Copyright (C) 1986-1987, 1989-1990, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1986-1987, 1989-1990, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: languages, lisp
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 1ebf2c126e8..608b266df8d 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -1,7 +1,6 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print
-;; Copyright (C) 1998-1999, 2001-2011
+;; Copyright (C) 1998-1999, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
 ;;   2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index ad881282ee5..159383ced02 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1,7 +1,6 @@
 ;;; ps-print.el --- print text from the buffer as PostScript
-;; Copyright (C) 1993-2011
+;; Copyright (C) 1993-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;      Jacques Duthen (was <duthen@cegelec-red.fr>)
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 7c094802363..f1060fb5150 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -1,7 +1,6 @@
 ;;; savehist.el --- Save minibuffer history.
-;; Copyright (C) 1997, 2005-2011
+;; Copyright (C) 1997, 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
 ;; Maintainer: FSF
diff --git a/lisp/server.el b/lisp/server.el
index 900db34eb55..62c59b41cee 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,7 +1,6 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process
-;; Copyright (C) 1986-1987, 1992, 1994-2011
+;; Copyright (C) 1986-1987, 1992, 1994-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
 ;; Maintainer: FSF
diff --git a/lisp/ses.el b/lisp/ses.el
index 6e012cae63e..2fc85d27df9 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1,7 +1,6 @@
 ;;; ses.el -- Simple Emacs Spreadsheet  -*- coding: utf-8 -*-
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
diff --git a/lisp/shell.el b/lisp/shell.el
index 638e332ada3..fcffc2317d5 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,7 +1,6 @@
 ;;; shell.el --- specialized comint.el for running the shell
-;; Copyright (C) 1988, 1993-1997, 2000-2011
+;; Copyright (C) 1988, 1993-1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;      Simon Marshall <simon@gnu.org>
diff --git a/lisp/sort.el b/lisp/sort.el
index 0ef282abedd..8ea3decb76f 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -1,6 +1,7 @@
 ;;; sort.el --- commands to sort text in an Emacs buffer
-;; Copyright (C) 1986-1987, 1994-1995, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1986-1987, 1994-1995, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Howie Kaye
 ;; Maintainer: FSF
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 6afc5a781d8..b84afd797d1 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1,7 +1,6 @@
 ;;; speedbar --- quick access to files and tags in a frame
-;; Copyright (C) 1996-2011
+;; Copyright (C) 1996-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 90fcfbfd1d9..059024c4bce 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -4,8 +4,7 @@
 ;; Maintainer: FSF
 ;; Keywords: mouse gpm linux
-;; Copyright (C) 1994-1995, 1998, 2006-2011
+;; Copyright (C) 1994-1995, 1998, 2006-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 22f90ba849a..fdac245c53b 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -1,7 +1,6 @@
 ;;; tar-mode.el --- simple editing of tar files from GNU emacs
-;; Copyright (C) 1990-1991, 1993-2011
+;; Copyright (C) 1990-1991, 1993-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;; Maintainer: FSF
diff --git a/lisp/term/README b/lisp/term/README
index 444d4625ecf..6d2e0acbd20 100644
--- a/lisp/term/README
+++ b/lisp/term/README
@@ -1,5 +1,4 @@
-Copyright (C) 1993, 2001-2011
+Copyright (C) 1993, 2001-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 58f4ece4e4d..43b799df1c9 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -1,6 +1,7 @@
 ;;; internal.el --- support for PC internal terminal
-;; Copyright (C) 1993-1994, 1998-1999, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 1998-1999, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Morten Welinder <terra@diku.dk>
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index ea135ffc19b..6286b83258b 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -1,7 +1,6 @@
 ;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/MacOS X window system
-;; Copyright (C) 1993-1994, 2005-2011
+;; Copyright (C) 1993-1994, 2005-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors: Carl Edman
 ;;      Christian Limpach
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 230081d4dbb..4cb88f6bd23 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,6 +1,7 @@
 ;;; pc-win.el --- setup support for `PC windows' (whatever that is)
-;; Copyright (C) 1994, 1996-1997, 1999, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1996-1997, 1999, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Maintainer: FSF
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index a763bf141cd..0e9de519c8c 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -1,7 +1,6 @@
 ;;; rxvt.el --- define function key sequences and standard colors for rxvt
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Eli Zaretskii
 ;; Keywords: terminals
diff --git a/lisp/terminal.el b/lisp/terminal.el
index 98008595950..d888a653c93 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1,6 +1,7 @@
 ;;; terminal.el --- terminal emulator for GNU Emacs
-;; Copyright (C) 1986-1989, 1993-1994, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1986-1989, 1993-1994, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Maintainer: FSF
diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el
index 553601dbea8..831d4e86676 100644
--- a/lisp/textmodes/bibtex-style.el
+++ b/lisp/textmodes/bibtex-style.el
@@ -1,7 +1,6 @@
 ;;; bibtex-style.el --- Major mode for BibTeX Style files
-;; Copyright (C) 2005, 2007-2011
+;; Copyright (C) 2005, 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: tex
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 484b567848b..2d2c0380a4a 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1,7 +1,6 @@
 ;;; bibtex.el --- BibTeX mode for GNU Emacs
-;; Copyright (C) 1992, 1994-1999, 2001-2011
+;; Copyright (C) 1992, 1994-1999, 2001-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
 ;;      Bengt Martensson <bengt@mathematik.uni-Bremen.de>
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index e5fcad7d22e..4e6c8bd6b05 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -1,7 +1,6 @@
 ;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: conf ini windows java
diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el
index 994eeea0aa7..0d5d28f8e5d 100644
--- a/lisp/textmodes/dns-mode.el
+++ b/lisp/textmodes/dns-mode.el
@@ -1,7 +1,6 @@
 ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files
-;; Copyright (C) 2000-2001, 2004-2011
+;; Copyright (C) 2000-2001, 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: DNS master zone file SOA comm
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index ab4eb328c50..ab31fed7069 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1,7 +1,6 @@
 ;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2
-;; Copyright (C) 1994-1995, 1997-2011
+;; Copyright (C) 1994-1995, 1997-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:           Ken Stevens <k.stevens@ieee.org>
 ;; Maintainer:       Ken Stevens <k.stevens@ieee.org>
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index b277f9e7758..8fb0bd85dab 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -1,6 +1,7 @@
 ;;; nroff-mode.el --- GNU Emacs major mode for editing nroff source
-;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1994-1995, 1997, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: wp
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index ed4c5989292..6e73fda662b 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -1,6 +1,7 @@
 ;;; page-ext.el --- extended page handling commands
-;; Copyright (C) 1990-1991, 1993-1994, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1990-1991, 1993-1994, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Robert J. Chassell <bob@gnu.org>
 ;; (according to ack.texi)
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 5527fdfc77b..b55146c2ff9 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -1,7 +1,6 @@
 ;;; rst.el --- Mode for viewing and editing reStructuredText-documents.
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Authors: Martin Blais <blais@furius.ca>,
 ;;          Stefan Merten <smerten@oekonux.de>,
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 8f06e029d40..2229dc6c9e8 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1,6 +1,7 @@
 ;;; sgml-mode.el --- SGML- and HTML-editing modes -*- coding: utf-8 -*-
-;; Copyright (C) 1992, 1995-1996, 1998, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1995-1996, 1998, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: James Clark <jjc@jclark.com>
 ;; Maintainer: FSF
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 73c1d089c10..d33cbb97dd8 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -1,6 +1,7 @@
 ;;; texinfmt.el --- format Texinfo files into Info files
-;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1988, 1990-1998, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: Robert J. Chassell <bug-texinfo@gnu.org>
 ;; Keywords: maint, tex, docs
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 8a3e03c9fe6..020faa197cd 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -1,7 +1,6 @@
 ;;; thingatpt.el --- get the `thing' at point
-;; Copyright (C) 1991-1998, 2000-2011
+;; Copyright (C) 1991-1998, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz>
 ;; Maintainer: FSF
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 104f0b820ca..9a9fc8b4a83 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -1,6 +1,7 @@
 ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
-;; Copyright (C) 1989, 1993-1995, 1997, 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1993-1995, 1997, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; This file is part of GNU Emacs.
diff --git a/lisp/time.el b/lisp/time.el
index 6dc0e14d75f..1bc1cca1112 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,6 +1,7 @@
 ;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*-
-;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
diff --git a/lisp/timezone.el b/lisp/timezone.el
index 8002c0a97b8..092d491a495 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -1,6 +1,7 @@
 ;;; timezone.el --- time zone package for GNU Emacs
-;; Copyright (C) 1990-1993, 1996, 1999, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 1996, 1999, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Author: Masanobu Umeda
 ;; Maintainer: umerin@mse.kyutech.ac.jp
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index 196b7abfdcb..b6f54db038e 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -1,7 +1,6 @@
 ;;; url-about.el --- Show internal URLs
-;; Copyright (C) 2001, 2004-2011
+;; Copyright (C) 2001, 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Keywords: comm, data, processes, hypermedia
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index c476f049e4a..a5371a423e0 100644
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -1,7 +1,6 @@
 ;;; url-cid.el --- Content-ID URL loader
-;; Copyright (C) 1998-1999, 2004-2011
+;; Copyright (C) 1998-1999, 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Keywords: comm, data, processes
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 60c7bfa0836..3d1f6afcb0e 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -1,7 +1,6 @@
 ;;; url-dav.el --- WebDAV support
-;; Copyright (C) 2001, 2004-2011
+;; Copyright (C) 2001, 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index 3d28e37ba0b..1781c362959 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -1,7 +1,6 @@
 ;;; url-expand.el --- expand-file-name for URLs
-;; Copyright (C) 1999, 2004-2011
+;; Copyright (C) 1999, 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Keywords: comm, data, processes
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 070bfa06fb2..2ba23583528 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -1,7 +1,6 @@
 ;;; url-gw.el --- Gateway munging for URL loading
-;; Copyright (C) 1997-1998, 2004-2011
+;; Copyright (C) 1997-1998, 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index ab0bf7b83de..4c63e48a3fc 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -1,6 +1,7 @@
 ;;; compare-w.el --- compare text between windows for Emacs
-;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2011
+;;   Free Software Foundation, Inc.
 ;; Maintainer: FSF
 ;; Keywords: convenience files vc
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 66c1eddc4a4..078947e8501 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1,7 +1,6 @@
 ;;; ediff-diff.el --- diff-related utilities
-;; Copyright (C) 1994-2011
+;; Copyright (C) 1994-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 5d91e65ab6a..468d12057ab 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -1,7 +1,6 @@
 ;;; ediff-ptch.el --- Ediff's  patch support
-;; Copyright (C) 1996-2011
+;; Copyright (C) 1996-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index bf18f117fd6..92f52157cb2 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1,7 +1,6 @@
 ;;; ediff-util.el --- the core commands and utilities of ediff
-;; Copyright (C) 1994-2011
+;; Copyright (C) 1994-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 01355da5f41..5a7fa0bf950 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -1,7 +1,6 @@
 ;;; ediff-wind.el --- window manipulation utilities
-;; Copyright (C) 1994-1997, 2000-2011
+;; Copyright (C) 1994-1997, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index 9b77d8f922e..67f86dd364c 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -1,7 +1,6 @@
 ;;; pcvs-defs.el --- variable definitions for PCL-CVS
-;; Copyright (C) 1991-2011
+;; Copyright (C) 1991-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el
index b2495f69343..3fd6cd40299 100644
--- a/lisp/vc/pcvs-info.el
+++ b/lisp/vc/pcvs-info.el
@@ -1,7 +1,6 @@
 ;;; pcvs-info.el --- internal representation of a fileinfo entry
-;; Copyright (C) 1991-2011
+;; Copyright (C) 1991-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el
index 1d184398ad0..59cefe047b6 100644
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@@ -1,7 +1,6 @@
 ;;; vc-arch.el --- VC backend for the Arch version-control system
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 489dfbe3e7c..5f386bcee76 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1,7 +1,6 @@
 ;;; vc-dir.el --- Directory status display under VC
-;; Copyright (C) 2007-2011
+;; Copyright (C) 2007-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:   Dan Nicolaescu <dann@ics.uci.edu>
 ;; Keywords: vc tools
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index a5ee99f9d2b..b12719642e9 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -1,7 +1,6 @@
 ;;; vc-dispatcher.el -- generic command-dispatcher facility.
-;; Copyright (C) 2008-2011
+;; Copyright (C) 2008-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Eric S. Raymond <esr@thyrsus.com>
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 7de35e84a2d..e7bfd273732 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1,7 +1,6 @@
 ;;; vc-hooks.el --- resident support for version-control
-;; Copyright (C) 1992-1996, 1998-2011
+;; Copyright (C) 1992-1996, 1998-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index a86f16ebab5..d3a64f15f9e 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -1,7 +1,6 @@
 ;;; vc-rcs.el --- support for RCS version-control
-;; Copyright (C) 1992-2011
+;; Copyright (C) 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 3348fda9618..0ee75e1c24a 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -1,7 +1,6 @@
 ;;; vc-sccs.el --- support for SCCS version-control
-;; Copyright (C) 1992-2011
+;; Copyright (C) 1992-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index a924b53ee62..aefef50cf79 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -1,7 +1,6 @@
 ;;; vc-svn.el --- non-resident support for Subversion version-control
-;; Copyright (C) 2003-2011
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 0a44ab2b06f..7f11a4b3333 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1,7 +1,6 @@
 ;;; vc.el --- drive a version-control system from within Emacs
-;; Copyright (C) 1992-1998, 2000-2011
+;; Copyright (C) 1992-1998, 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/view.el b/lisp/view.el
index 07bb10f4ff5..b7b43e35997 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -1,6 +1,7 @@
 ;;; view.el --- peruse file or buffer without editing
-;; Copyright (C) 1985, 1989, 1994-1995, 1997, 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1989, 1994-1995, 1997, 2000-2011
+;;   Free Software Foundation, Inc.
 ;; Author: K. Shane Hartman
 ;; Maintainer: Inge Frick <inge@nada.kth.se>
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 79e475d6af5..d1e8edc40be 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -1,7 +1,6 @@
 ;;; w32-vars.el --- MS-Windows specific user options
-;; Copyright (C) 2002-2011
+;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jason Rumney <jasonr@gnu.org>
 ;; Keywords: internal
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 463e0ff94d2..11ef25d4eac 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -1,7 +1,6 @@
 ;;; wdired.el --- Rename files editing their names in dired buffers
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Filename: wdired.el
 ;; Author: Juan Le�n Lahoz Garc�a <juanleon1@gmail.com>
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 93d82ca998f..8d25a161b47 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1,7 +1,6 @@
 ;;; whitespace.el --- minor mode to visualize TAB, (HARD) SPACE, NEWLINE
-;; Copyright (C) 2000-2011
+;; Copyright (C) 2000-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 15c1834ebbc..b12cb6c3ab7 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1,7 +1,6 @@
 ;;; x-dnd.el --- drag and drop support for X  -*- coding: utf-8 -*-
-;; Copyright (C) 2004-2011
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
-;;   Free Software Foundation, Inc.
 ;; Author: Jan Djärv <jan.h.d@swipnet.se>
 ;; Maintainer: FSF
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 7e21b331c2b..14d1c03c4a3 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1,7 +1,7 @@
 /* The lwlib interface to Motif widgets.
-   Copyright (C) 1994-1997, 1999-2011
-                 Free Software Foundation, Inc.
+Copyright (C) 1994-1997, 1999-2011  Free Software Foundation, Inc.
-   Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1992 Lucid, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index 7df846a17a1..1f0f973d7b9 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,7 +1,7 @@
 /* Interface of a lightweight menubar widget.
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002-2011
-  Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 9c7c4d88f55..b7ea9de54f7 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,7 +1,7 @@
 /* Internals of a lightweight menubar widget.
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002-2011
-  Free Software Foundation, Inc.
 This file is part of the Lucid Widget Library.
diff --git a/nt/INSTALL b/nt/INSTALL
index bfcc208b3d9..a0ca4a1ebb5 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,8 +1,7 @@
                    Building and Installing Emacs on Windows
                          (from 95 to 7 and beyond)
-  Copyright (C) 2001-2011
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  See the end of the file for license conditions.
 * For the impatient
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index bf4544edba9..1c439e2fb85 100644
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,7 +1,6 @@
 /* Replacement grp.h file for building GNU Emacs on Windows.
-Copyright (C) 2003-2011
+Copyright (C) 2003-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index 86083cf4990..27aa5fa306c 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -1,7 +1,6 @@
 /* Replacement langinfo.h file for building GNU Emacs on Windows.
-Copyright (C) 2006-2011
+Copyright (C) 2006-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index b39f99e2b3c..b95018609cc 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -1,7 +1,6 @@
 /* Replacement nl_types.h file for building GNU Emacs on Windows.
-Copyright (C) 2006-2011
+Copyright (C) 2006-2011 Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -24,4 +23,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 typedef int nl_item;
 #endif  /* _NL_TYPES_H */
diff --git a/nt/paths.h b/nt/paths.h
index 7ebd6aed4cb..21c039c8d0d 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 1993, 1995, 1997, 1999, 2001-2011 Free Software Foundation, Inc.
+/* paths.h file for MS Windows
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/nt/runemacs.c b/nt/runemacs.c
index 6cb145e9ef6..07e24f745f8 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 2001-2011
+/* runemacs --- Simple program to start Emacs with its console window hidden.
-     Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 0b19d4cdc00..a361142faae 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16507,8 +16507,7 @@ See ChangeLog.2 for earlier changes.
 ;; coding: utf-8
 ;; End:
-    Copyright (C) 1993, 2001-2011
+  Copyright (C) 1993, 2001-2011  Free Software Foundation, Inc.
-        Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -16524,4 +16523,3 @@ See ChangeLog.2 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index af73b620281..dc8fe23a221 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6906,8 +6906,7 @@ See ChangeLog.3 for earlier changes.
 ;; coding: utf-8
 ;; End:
-    Copyright (C) 1993-1994, 2001-2011
+  Copyright (C) 1993-1994, 2001-2011  Free Software Foundation, Inc.
-        Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -6923,4 +6922,3 @@ See ChangeLog.3 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 2338f09d441..1f21e9fb99c 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7148,8 +7148,7 @@ See ChangeLog.4 for earlier changes.
 ;; coding: utf-8
 ;; End:
-    Copyright (C) 1994-1995, 2001-2011
+  Copyright (C) 1994-1995, 2001-2011  Free Software Foundation, Inc.
-        Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -7165,4 +7164,3 @@ See ChangeLog.4 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 5544ff5e3aa..d7903568102 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5354,8 +5354,7 @@
 See ChangeLog.5 for earlier changes.
-    Copyright (C) 1995-1996, 2001-2011
+  Copyright (C) 1995-1996, 2001-2011  Free Software Foundation, Inc.
-        Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -5371,4 +5370,3 @@ See ChangeLog.5 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index c21de3ec562..d5bebec660f 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11092,8 +11092,7 @@ See ChangeLog.6 for earlier changes.
 ;; coding: utf-8
 ;; End:
-    Copyright (C) 1997-1998, 2001-2011
+  Copyright (C) 1997-1998, 2001-2011  Free Software Foundation, Inc.
-        Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -11109,4 +11108,3 @@ See ChangeLog.6 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index e780b74c298..833119c9fcf 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13979,8 +13979,7 @@
 See ChangeLog.7 for earlier changes.
-    Copyright (C) 1999, 2001-2011
+  Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
-        Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -13996,4 +13995,3 @@ See ChangeLog.7 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index b235851f082..0c39de74a6a 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13294,8 +13294,7 @@ See ChangeLog.8 for earlier changes.
 ;; coding: utf-8
 ;; End:
-    Copyright (C) 2001-2011
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
-        Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -13311,4 +13310,3 @@ See ChangeLog.8 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 319793bb6b1..6f82f99bd26 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -1,5 +1,6 @@
 /* GNU Emacs case conversion functions.
-   Copyright (C) 1985, 1994, 1997-1999, 2001-2011 Free Software Foundation, Inc.
+Copyright (C) 1985, 1994, 1997-1999, 2001-2011 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/category.c b/src/category.c
index a0e370c5b61..06046959b6f 100644
--- a/src/category.c
+++ b/src/category.c
@@ -1,13 +1,13 @@
 /* GNU Emacs routines to deal with category tables.
-   Copyright (C) 1998, 2001-2011
-     Free Software Foundation, Inc.
+Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006, 2007, 2008, 2009, 2010, 2011
+  2005, 2006, 2007, 2008, 2009, 2010, 2011
-     National Institute of Advanced Industrial Science and Technology (AIST)
+  National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H14PRO021
+  Registration Number H14PRO021
-   Copyright (C) 2003
+Copyright (C) 2003
-     National Institute of Advanced Industrial Science and Technology (AIST)
+  National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H13PRO009
+  Registration Number H13PRO009
 This file is part of GNU Emacs.
diff --git a/src/cmds.c b/src/cmds.c
index 2929a1a758a..ce05b19e1c2 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -1,6 +1,6 @@
 /* Simple built-in editing commands.
-   Copyright (C) 1985, 1993-1998, 2001-2011
-                 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993-1998, 2001-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/dispextern.h b/src/dispextern.h
index 4dd6aba3173..26e0bb61f17 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1,6 +1,6 @@
 /* Interface definitions for display code.
-   Copyright (C) 1985, 1993-1994, 1997-2011
-                 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993-1994, 1997-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/dosfns.h b/src/dosfns.h
index 13205e30a6e..89800598d28 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -2,7 +2,8 @@
   Coded by Manabu Higashida, 1991.
   Modified by Morten Welinder, 1993-1994.
-   Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/epaths.in b/src/epaths.in
index 198086b5916..54131f0e179 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -1,5 +1,7 @@
 /* Hey Emacs, this is -*- C -*- code!  */
-/* Copyright (C) 1993, 1995, 1997, 1999, 2001-2011 Free Software Foundation, Inc.
+/*
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/floatfns.c b/src/floatfns.c
index a87e8c012f5..c00923643d1 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1,5 +1,7 @@
 /* Primitive operations on floating point for GNU Emacs Lisp interpreter.
-   Copyright (C) 1988, 1993-1994, 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1988, 1993-1994, 1999, 2001-2011
+  Free Software Foundation, Inc.
 Author: Wolfgang Rupprecht
 (according to ack.texi)
diff --git a/src/font.c b/src/font.c
index 605683e5282..eb217c6f60f 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1,10 +1,9 @@
 /* font.c -- "Font" primitives.
-Copyright (C) 2006-2011
+Copyright (C) 2006-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
+Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
-   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+  National Institute of Advanced Industrial Science and Technology (AIST)
-     National Institute of Advanced Industrial Science and Technology (AIST)
+  Registration Number H13PRO009
-     Registration Number H13PRO009
 This file is part of GNU Emacs.
diff --git a/src/fontset.c b/src/fontset.c
index aacef63da2a..f94bc954fa4 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,13 +1,13 @@
 /* Fontset handler.
-   Copyright (C) 2001-2011
-     Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006, 2007, 2008, 2009, 2010, 2011
+  2005, 2006, 2007, 2008, 2009, 2010, 2011
-     National Institute of Advanced Industrial Science and Technology (AIST)
+  National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H14PRO021
+  Registration Number H14PRO021
-   Copyright (C) 2003, 2006
+Copyright (C) 2003, 2006
-     National Institute of Advanced Industrial Science and Technology (AIST)
+  National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H13PRO009
+  Registration Number H13PRO009
 This file is part of GNU Emacs.
diff --git a/src/frame.c b/src/frame.c
index ddf1ef59ada..961c42c0976 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,7 +1,6 @@
 /* Generic frame functions.
-   Copyright (C) 1993-1995, 1997, 1999-2011
+Copyright (C) 1993-1995, 1997, 1999-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index d5d2e82ac89..6367949a649 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1,6 +1,6 @@
 /* Functions for creating and updating GTK widgets.
-   Copyright (C) 2003-2011
-     Free Software Foundation, Inc.
+Copyright (C) 2003-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 9e24e6e0324..3dc0a1dd150 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for GTK widgets.
-   Copyright (C) 2003-2011
-     Free Software Foundation, Inc.
+Copyright (C) 2003-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/keyboard.c b/src/keyboard.c
index 0dace15bb28..8ae6eb9b29a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1,5 +1,6 @@
 /* Keyboard and mouse input; editor command loop.
-   Copyright (C) 1985-1989, 1993-1997, 1999-2011 Free Software Foundation, Inc.
+Copyright (C) 1985-1989, 1993-1997, 1999-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/menu.c b/src/menu.c
index 9f616f7f6c9..851f1ac804b 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,5 +1,7 @@
 /* Platform-independent code for terminal communications.
-   Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011 Free Software Foundation, Inc.
+Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/msdos.c b/src/msdos.c
index 8417b1da3af..eb73f54838d 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1,6 +1,6 @@
 /* MS-DOS specific C utilities.          -*- coding: raw-text -*-
-   Copyright (C) 1993-1997, 1999-2011
-                 Free Software Foundation, Inc.
+Copyright (C) 1993-1997, 1999-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/nsfns.m b/src/nsfns.m
index 9652910258a..f1bf8b65727 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1,6 +1,7 @@
 /* Functions for the NeXT/Open/GNUstep and MacOSX window system.
-Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2011  Free Software Foundation, Inc.
+Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/print.c b/src/print.c
index adba4ee9145..79ff8ba314b 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,7 @@
 /* Lisp object printing and output streams.
-   Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2011 Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/process.c b/src/process.c
index fc8b45508d1..22446fb7004 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,5 +1,7 @@
 /* Asynchronous subprocess control for GNU Emacs.
-   Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2011 Free Software Foundation, Inc.
+Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/regex.c b/src/regex.c
index aa4b1cc48df..cb6edc2e356 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2,8 +2,7 @@
   0.12.  (Implements POSIX draft P1003.2/D11.2, except for some of the
   internationalization features.)
-   Copyright (C) 1993-2011
+   Copyright (C) 1993-2011  Free Software Foundation, Inc.
-                 Free Software Foundation, Inc.
   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
diff --git a/src/region-cache.c b/src/region-cache.c
index e4f4c57237a..1f9b62da9fa 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -1,5 +1,7 @@
 /* Caching facts about regions of the buffer, for optimization.
-   Copyright (C) 1985-1989, 1993, 1995, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1989, 1993, 1995, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/region-cache.h b/src/region-cache.h
index 0366c80036a..0da159285e4 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -1,5 +1,7 @@
 /* Header file: Caching facts about regions of the buffer, for optimization.
-   Copyright (C) 1985-1986, 1993, 1995, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1993, 1995, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/scroll.c b/src/scroll.c
index cc6e4487293..08ae83eeee8 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,7 @@
-/* Calculate what line insertion or deletion to do, and do it,
+/* Calculate what line insertion or deletion to do, and do it
-   Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/syntax.h b/src/syntax.h
index e27744c823b..bea66d1fada 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -1,5 +1,7 @@
 /* Declarations having to do with GNU Emacs syntax tables.
-   Copyright (C) 1985, 1993-1994, 1997-1998, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985, 1993-1994, 1997-1998, 2001-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/termhooks.h b/src/termhooks.h
index 806433fc19e..b147f6ed0a1 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -1,5 +1,6 @@
 /* Parameters and display hooks for terminal devices.
-   Copyright (C) 1985-1986, 1993-1994, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1993-1994, 2001-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/w32fns.c b/src/w32fns.c
index 14c5c5d77a6..b09bb0b5b5f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1,7 +1,6 @@
 /* Graphical user interface functions for the Microsoft W32 API.
-Copyright (C) 1989, 1992-2011
+Copyright (C) 1989, 1992-2011  Free Software Foundation, Inc.
-                 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/w32term.c b/src/w32term.c
index a9181eee129..cd4ee54fd2c 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,7 +1,6 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
-Copyright (C) 1989, 1993-2011
+Copyright (C) 1989, 1993-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/xfaces.c b/src/xfaces.c
index c41511d20a6..c7467b0fccc 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,7 +1,6 @@
 /* xfaces.c -- "Face" primitives.
-   Copyright (C) 1993-1994, 1998-2011
+Copyright (C) 1993-1994, 1998-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/xgselect.c b/src/xgselect.c
index ff00b9583da..359a8fbc89b 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -1,6 +1,6 @@
 /* Function for handling the GLib event loop.
-   Copyright (C) 2009-2011
-     Free Software Foundation, Inc.
+Copyright (C) 2009-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/xgselect.h b/src/xgselect.h
index 24659ba9a49..1d3a8508b9c 100644
--- a/src/xgselect.h
+++ b/src/xgselect.h
@@ -1,6 +1,6 @@
 /* Header for xg_select.
-   Copyright (C) 2009-2011
-     Free Software Foundation, Inc.
+Copyright (C) 2009-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/xmenu.c b/src/xmenu.c
index 5276d240aa3..8ab10be8fac 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,5 +1,7 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011 Free Software Foundation, Inc.
+Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/xsettings.h b/src/xsettings.h
index c5956a54437..5b2fdbf43c5 100644
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -1,6 +1,6 @@
 /* Functions for handle font changes dynamically.
-   Copyright (C) 2009-2011
-                 Free Software Foundation, Inc.
+Copyright (C) 2009-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/xsmfns.c b/src/xsmfns.c
index aae197105bc..15db459e149 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -1,7 +1,7 @@
 /* Session management module for systems which understand the X Session
   management protocol.
-   Copyright (C) 2002-2011
-     Free Software Foundation, Inc.
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/xterm.c b/src/xterm.c
index b1beabdd31e..4f5563b79da 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,7 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
-Copyright (C) 1989, 1993-2011
+Copyright (C) 1989, 1993-2011  Free Software Foundation, Inc.
-                 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/update-subdirs b/update-subdirs
index f9f95609be0..dfd594ae781 100755
--- a/update-subdirs
+++ b/update-subdirs
@@ -1,7 +1,8 @@
 #!/bin/sh
 # Write into $1/subdirs.el a list of subdirs of directory $1.
-# Copyright (C) 1994-1995, 1997, 1999, 2001-2011  Free Software Foundation, Inc.
+# Copyright (C) 1994-1995, 1997, 1999, 2001-2011
+#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
author	Glenn Morris	2011-01-26 00:36:39 -0800
committer	Glenn Morris	2011-01-26 00:36:39 -0800
commit	95df8112a0cbdb06addbac5fbea03b37d4440418 (patch)
tree	40de7680f5332a55701dc1477722357dd37803b3
parent	008cad902f3434dc8c490dd0488ae93df4f16d9c (diff)
download	emacs-95df8112a0cbdb06addbac5fbea03b37d4440418.tar.gz emacs-95df8112a0cbdb06addbac5fbea03b37d4440418.zip