diff --git a/src/common/config.py b/src/common/config.py
index b6f909c14769998934292e460fd57dab61e15a62..f895c73d8a5e51ddad23165c88bc4e23e58214ea 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -2,7 +2,7 @@
 ##
 ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org>
 ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org>
-## Copyright (C) 2005 Stéphan Kochen <stephan AT kochen.nl>
+## Copyright (C) 2005 Stephan Kochen <stephan AT kochen.nl>
 ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com>
 ##                         Alex Mauer <hawke AT hawkesnest.net>
 ##                         Nikos Kouremenos <kourem AT gmail.com>
diff --git a/src/common/connection.py b/src/common/connection.py
index 0ed03748ea34f64d36c1750a9039c8aaf04ddca2..5a0f0fff22ea82c8dc5ccbf5763f4f22ccfb9523 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -3,7 +3,7 @@
 ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org>
 ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org>
 ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net>
-##                    Stéphan Kochen <stephan AT kochen.nl>
+##                    Stephan Kochen <stephan AT kochen.nl>
 ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com>
 ##                         Travis Shirk <travis AT pobox.com>
 ##                         Nikos Kouremenos <kourem AT gmail.com>
diff --git a/src/common/pep.py b/src/common/pep.py
index f7816437090da6ffbd0c60d03a2ec190f2626ce9..9814c49371d6ad365bfeaa94906c93d9426a0409 100644
--- a/src/common/pep.py
+++ b/src/common/pep.py
@@ -1,3 +1,27 @@
+## src/common/pep.py
+##
+## Copyright (C) 2007 Piotr Gaczkowski <doomhammerng AT gmail.com>
+## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org>
+## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com>
+##                    Jean-Marie Traissard <jim AT lapin.org>
+##                    Jonathan Schleifer <js-gajim AT webkeks.org>
+##                    Stephan Erb <steve-e AT h3c.de>
+##
+## This file is part of Gajim.
+##
+## Gajim 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; version 3 only.
+##
+## Gajim 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 Gajim. If not, see <http://www.gnu.org/licenses/>.
+##
+
 from common import gajim, xmpp
 
 MOODS = {
diff --git a/src/common/sleepy.py b/src/common/sleepy.py
index c42e52546666549d5c3fafb7d548d1b5fbbb33b3..a017600e6a80b0247cac62904e04f3a2ffd0b05e 100644
--- a/src/common/sleepy.py
+++ b/src/common/sleepy.py
@@ -1,11 +1,10 @@
 ## src/common/sleepy.py
 ##
 ## Copyright (C) 2003-2007 Yann Leboulanger <asterix AT lagaule.org>
-## Copyright (C) 2005-2006 Yann Leboulanger <asterix AT lagaule.org>
-##                         Nikos Kouremenos <kourem AT gmail.com>
+## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com>
 ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org>
 ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
-##                    Mateusz Biliński <mateusz AT bilinski.it>
+##                    Mateusz Bilinski <mateusz AT bilinski.it>
 ##
 ## This file is part of Gajim.
 ##
diff --git a/src/config.py b/src/config.py
index b9fb2adaae3ed892e5273cf37f5c906ae6df7abb..35f367dff26d1c07be983529b6a7836ca7a56250 100644
--- a/src/config.py
+++ b/src/config.py
@@ -3,7 +3,7 @@
 ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org>
 ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org>
 ## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com>
-##                    Stéphan Kochen <stephan AT kochen.nl>
+##                    Stephan Kochen <stephan AT kochen.nl>
 ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com>
 ##                         Nikos Kouremenos <kourem AT gmail.com>
 ## Copyright (C) 2006 Junglecow <junglecow AT gmail.com>
diff --git a/src/disco.py b/src/disco.py
index 8bbc01c848bf8bf651d523fdaa1bceb6e24fd461..3f947b340500722a71e7a09ee511a01ab6135b44 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ## src/disco.py
 ##
-## Copyright (C) 2005-2006 Stéphan Kochen <stephan AT kochen.nl>
+## Copyright (C) 2005-2006 Stephan Kochen <stephan AT kochen.nl>
 ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com>
 ## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org>
 ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com>
diff --git a/src/gajim.py b/src/gajim.py
index 50265fc34aae9fbf20e3682fe8241693ded86a85..7a0099233f3a722881336d425be342431394606c 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -5,7 +5,7 @@
 ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org>
 ## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com>
 ##                    Norman Rasmussen <norman AT rasmussen.co.za>
-##                    Stéphan Kochen <stephan AT kochen.nl>
+##                    Stephan Kochen <stephan AT kochen.nl>
 ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com>
 ##                         Alex Mauer <hawke AT hawkesnest.net>
 ## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com>
diff --git a/src/roster_window.py b/src/roster_window.py
index eb4816cb72e6906954dee44a88ef232614f5a2d2..d7528488f1f5a2244d9bf3cf7076c211857373c6 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3,7 +3,7 @@
 ##
 ## Copyright (C) 2003-2008 Yann Leboulanger <asterix AT lagaule.org>
 ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net>
-##                    Stéphan Kochen <stephan AT kochen.nl>
+##                    Stephan Kochen <stephan AT kochen.nl>
 ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com>
 ## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com>
 ##                         Nikos Kouremenos <kourem AT gmail.com>
diff --git a/src/tooltips.py b/src/tooltips.py
index 9932177be4b0b013db664128478e6e8bbc4f1165..0982c126505fa5257ff5b5dc9127a4aa674d3cd5 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -2,7 +2,7 @@
 ## src/tooltips.py
 ##
 ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net>
-##                    Stéphan Kochen <stephan AT kochen.nl>
+##                    Stephan Kochen <stephan AT kochen.nl>
 ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com>
 ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com>
 ## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org>