diff --git a/doc/org.texi b/doc/org.texi
index 143b18475..002ada1ac 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -265,8 +265,7 @@
@copying
This manual is for Org version @value{VERSION}.
-Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+Copyright @copyright{} 2004-2011 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index 759292c02..cccf0ce6f 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -17,8 +17,8 @@
\pdflayout=(0l)
% Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
-% 2006, 2007, 2008, 2009 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/lisp/ob-R.el b/lisp/ob-R.el
index 242b1d990..396949757 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -2,7 +2,8 @@
;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;; Dan Davison
;; Keywords: literate programming, reproducible research, R, statistics
;; Homepage: http://orgmode.org
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 0743b4cd8..9ed13d69f 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -2,7 +2,8 @@
;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-;; Author: Joel Boehland, Eric Schulte
+;; Author: Joel Boehland
+;; Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index cf5c92382..c6ae85ffe 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -2,7 +2,8 @@
;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
diff --git a/lisp/ob-js.el b/lisp/ob-js.el
index e147ba22d..e4379a29a 100644
--- a/lisp/ob-js.el
+++ b/lisp/ob-js.el
@@ -6,22 +6,20 @@
;; Keywords: literate programming, reproducible research, js
;; Homepage: http://orgmode.org
-;;; License:
+;; This file is part of GNU Emacs.
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see .
;;; Commentary:
@@ -34,7 +32,7 @@
;; - a non-browser javascript engine such as node.js http://nodejs.org/
;; or mozrepl http://wiki.github.com/bard/mozrepl/
-;;
+;;
;; - for session based evaluation mozrepl and moz.el are required see
;; http://wiki.github.com/bard/mozrepl/emacs-integration for
;; configuration instructions
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 8525d82c0..2c7bcd660 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -2,7 +2,9 @@
;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-;; Author: Joel Boehland, Eric Schulte, David T. O'Toole
+;; Author: Joel Boehland
+;; Eric Schulte
+;; David T. O'Toole
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index 334182d7a..307e23731 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -2,7 +2,8 @@
;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index 1a03d0a40..12e6c17a7 100644
--- a/lisp/ob-perl.el
+++ b/lisp/ob-perl.el
@@ -2,7 +2,8 @@
;; Copyright (C) 2009-2011 Free Software Foundation
-;; Author: Dan Davison, Eric Schulte
+;; Author: Dan Davison
+;; Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index 1378d8808..c84b11d77 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -2,7 +2,8 @@
;; Copyright (C) 2009-2011 Free Software Foundation
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 0136d0277..bff3b3ff7 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -2,7 +2,8 @@
;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index 10f1cf7f6..14198ba6a 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -6,22 +6,20 @@
;; Keywords: literate programming, reproducible research, scheme
;; Homepage: http://orgmode.org
-;;; License:
+;; This file is part of GNU Emacs.
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
-;;
+
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see .
;;; Commentary:
@@ -34,7 +32,7 @@
;; - a working scheme implementation
;; (e.g. guile http://www.gnu.org/software/guile/guile.html)
-;;
+;;
;; - for session based evaluation cmuscheme.el is required which is
;; included in Emacs
diff --git a/lisp/ob.el b/lisp/ob.el
index 7d6e31456..5d91ac356 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -2,7 +2,8 @@
;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;; Dan Davison
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el
index b4a70db45..736228e72 100644
--- a/lisp/org-freemind.el
+++ b/lisp/org-freemind.el
@@ -56,26 +56,6 @@
;; Added y/n question before showing in FreeMind.
;; 2009-11-04: Added support for #+BEGIN_HTML.
;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or
-;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-;; General Public License for more details.
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
;;; Code:
(require 'xml)