diff --git a/LICENSE b/COPYING
similarity index 98%
rename from LICENSE
rename to COPYING
index 3c76f72..2da9ca3 100644
--- a/LICENSE
+++ b/COPYING
@@ -1,15 +1,3 @@
-Copyright (c) since 2011 by:
-  lynX    (psyc://psyced.org/~lynX)
-  Marenz  (psyc://supraverse.net/~marenz)
-  tg      (psyc://psyced.org/~tg)
-
-Unless indicated otherwise (a license reference in file headers, or a 
-LICENSE file in a directory), all libpsyc source files use the AGPL 
-with additional permissions to link libpsyc libraries with non-AGPL
-works; the text of the linking exception is located at the end of
-this file.
-
-
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
diff --git a/README.org b/README.org
index f647d65..4226b71 100644
--- a/README.org
+++ b/README.org
@@ -44,27 +44,29 @@ For more information see the API documentation at [[http://lib.psyc.eu/doc/]].
 : test/     # test sourcecodes and test input files
 : d/        # the D binding
 
-* Authors
-
-The library is being developed by
-
-- tg     -- psyc://psyced.org/~tg
-- lynx   -- psyc://psyced.org/~lynx
-- Marenz -- psyc://supraverse.net/~marenz
-
 * Contact
 
 If you created new bindings, patches or anything other that you think should go
 into the library, contact either anyone of us directly or just join the
-developement room at
+development room at
 
 - psyc://psyced.org/@welcome
 - irc://psyced.org/welcome
 - xmpp:*welcome@psyced.org
 
+* Authors
+
+This library is being developed by:
+- Carlo v. Loesch / lynX <psyc://psyced.org/~lynX>
+- Gabor X Toth / tg(x) <tg-x.net> <psyc://psyced.org/~tg>
+- Mathias L. Baumann / Marenz <psyc://supraverse.net/~marenz>
+
 * License
 
-This library is distributed under the AGPL license with a linking exception, see the LICENSE file for details.
+Unless indicated otherwise, all libpsyc source files use the AGPL with
+additional permissions to link libpsyc libraries with non-AGPL works; the full
+text of the license is located in the [[./COPYING][COPYING]] file with the linking exception at
+the end.
 
 * Style Wars