diff --git a/Core/core.py b/Core/core.py
index 007c52c20e170d1b4d6d0e8f0f5ee3017ac7c218..91a8ef560c689d434e3797cc0cf42c428cdc14c3 100644
--- a/Core/core.py
+++ b/Core/core.py
@@ -1,10 +1,10 @@
 ##	core/core.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/Messages/fr/LC_MESSAGES/gajim.po b/Messages/fr/LC_MESSAGES/gajim.po
index fa20dfe323efbcc10072c8bc46fde13add12e7a1..bb689e0671c44fa6057e3c5c3f3aa2db0ac5981d 100644
--- a/Messages/fr/LC_MESSAGES/gajim.po
+++ b/Messages/fr/LC_MESSAGES/gajim.po
@@ -460,11 +460,11 @@ msgstr ""
 msgid ""
 "<b>Gajim</b> (http://www.gajim.org)\n"
 "\n"
-"Copyright © 2003-2004 Gajim Team\n"
+"Copyright © 2003-2005 Gajim Team\n"
 "\n"
 "<b>Gajim Team</b>\n"
 "Vincent Hanquez (tab@snarc.org)\n"
-"Yann Le Boulanger (asterix@crans.org)"
+"Yann Le Boulanger (asterix@lagaule.org)"
 msgstr ""
 
 #: plugins/gtkgui/msg.c:31
diff --git a/common/hub.py b/common/hub.py
index b0602dc9c73b9e312090dee2b86400ebd5c17243..c0178b1f94066653f656ecf82fa7911a4f2e4a92 100644
--- a/common/hub.py
+++ b/common/hub.py
@@ -1,10 +1,10 @@
 ##	common/hub.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/common/i18n.py b/common/i18n.py
index e845459646776bc2e5f18e3766d1648ec6089889..2045d152f5318cf4a5b7dee6f8f670752bfab75c 100644
--- a/common/i18n.py
+++ b/common/i18n.py
@@ -1,10 +1,10 @@
 ##	common/i18n.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/common/idle.c b/common/idle.c
index 6d13b810deebe5f20017e9521c2c746575249697..881905908e230aea77517f8ac4c0aea3ba2a85d1 100644
--- a/common/idle.c
+++ b/common/idle.c
@@ -1,3 +1,21 @@
+/*      common/idle.c
+ *
+ * Gajim Team:
+ *      - Yann Le Boulanger <asterix@lagaule.org>
+ *      - Vincent Hanquez <tab@snarc.org>
+ *
+ *      Copyright (C) 2003-2005 Gajim Team
+ *
+ * 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; version 2 only.
+ *
+ * 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.
+*/
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/scrnsaver.h>
diff --git a/common/optparser.py b/common/optparser.py
index c5b06e6845840426348ccf2f6c336372dcf24a3e..3d685daab10f56e325cee8d6bd5b6276fc35dfa9 100644
--- a/common/optparser.py
+++ b/common/optparser.py
@@ -1,10 +1,10 @@
 ##	common/optparser.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/common/plugin.py b/common/plugin.py
index f58cb58f8a7facf708110539bbf994535ce9e6ec..e7a8a3c220c9cf9b1cde7130eef9f780ca0a935e 100644
--- a/common/plugin.py
+++ b/common/plugin.py
@@ -1,10 +1,10 @@
 ##	common/plugin.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/common/setup.py b/common/setup.py
index d3dc6ff9c63dfc4e27910d5627f60ff83a850262..09ac52a9065c848eeb07793b53bbeb77cd616950 100644
--- a/common/setup.py
+++ b/common/setup.py
@@ -1,3 +1,21 @@
+##      common/setup.py
+##
+## Gajim Team:
+##      - Yann Le Boulanger <asterix@lagaule.org>
+##      - Vincent Hanquez <tab@snarc.org>
+##
+##      Copyright (C) 2003-2005 Gajim Team
+##
+## 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; version 2 only.
+##
+## 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.
+##
+
 from distutils.core import setup, Extension
 
 module1 = Extension( 'idle',
diff --git a/common/sleepy.py b/common/sleepy.py
index b1a323376a98fd77c486e2e0b15cd19be61ec732..53c274d49ce5c3bb243c7ed38bcf7e3dedd83a6e 100644
--- a/common/sleepy.py
+++ b/common/sleepy.py
@@ -1,4 +1,20 @@
-"""A Quick class to tell if theres any activity on your machine"""
+##      common/sleepy.py
+##
+## Gajim Team:
+##      - Yann Le Boulanger <asterix@lagaule.org>
+##      - Vincent Hanquez <tab@snarc.org>
+##
+##      Copyright (C) 2003-2005 Gajim Team
+##
+## 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; version 2 only.
+##
+## 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.
+##
 
 import time
 from string import find, lower
diff --git a/common/thread.py b/common/thread.py
index 684422acc0869010a500dc2f227b1713fbfe6faa..60f9f7a4ca930dd8fb4a16efafe0543fcde0ad78 100644
--- a/common/thread.py
+++ b/common/thread.py
@@ -1,10 +1,10 @@
 ##	common/thread.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index d36c227f95c3b5fb442268b0743e45476712c3e7..191397b17186f4dda982fe866212b9f9378cecec 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -1,10 +1,10 @@
 ##	plugins/config.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py
index 2bd5dde612c5e07aa317c611d4cc06dce9b3a051..70e20cb22f271030144324b5f72013b1675ade52 100644
--- a/plugins/gtkgui/dialogs.py
+++ b/plugins/gtkgui/dialogs.py
@@ -1,10 +1,10 @@
 ##	plugins/dialogs.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index cf9d192ca31923759566e8c7d4acef901e88c4de..016d231956714b708630357590061433ac23baa8 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -872,11 +872,11 @@
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">&lt;b&gt;Gajim&lt;/b&gt; (http://www.gajim.org)
 
-Copyright © 2003-2004 Gajim Team
+Copyright © 2003-2005 Gajim Team
 
 &lt;b&gt;Gajim Team&lt;/b&gt;
 Vincent Hanquez (tab@snarc.org)
-Yann Le Boulanger (asterix@crans.org)</property>
+Yann Le Boulanger (asterix@lagaule.org)</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 5435ddf72f9ad2486598cd91fcc14122f5d0c797..136ca96bbb7869bbc67507858f8f2a8a46d02168 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -1,10 +1,10 @@
 ##	plugins/gtkgui.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/plugins/logger/logger.py b/plugins/logger/logger.py
index 479ca1c28fbd39fa1c0e6cb60f3df54c642d287f..da3f9a48436614f03f4e325424fa1661d6a0c8a7 100644
--- a/plugins/logger/logger.py
+++ b/plugins/logger/logger.py
@@ -1,10 +1,10 @@
 ##      plugins/logger.py
 ##
 ## Gajim Team:
-##      - Yann Le Boulanger <asterix@crans.org>
+##      - Yann Le Boulanger <asterix@lagaule.org>
 ##      - Vincent Hanquez <tab@snarc.org>
 ##
-##      Copyright (C) 2003 Gajim Team
+##      Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/plugins/sock/sock.py b/plugins/sock/sock.py
index b39c32867d137794a4ca4b2609b2ed8d9a31e0b0..5d9cf92fa2074f6da7ec9251b630a8011bd7e9e8 100644
--- a/plugins/sock/sock.py
+++ b/plugins/sock/sock.py
@@ -1,10 +1,10 @@
 ##      plugins/sock.py
 ##
 ## Gajim Team:
-##      - Yann Le Boulanger <asterix@crans.org>
+##      - Yann Le Boulanger <asterix@lagaule.org>
 ##      - Vincent Hanquez <tab@snarc.org>
 ##
-##      Copyright (C) 2003 Gajim Team
+##      Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/runCore.py b/runCore.py
index 69dfa5d047ddf8e32bc5c39d0d5f302ca462a74e..c54a3697bd8ebefa8400cb501b1d0ba026c3d15f 100755
--- a/runCore.py
+++ b/runCore.py
@@ -2,10 +2,10 @@
 ##	runCore.py
 ##
 ## Gajim Team:
-## 	- Yann Le Boulanger <asterix@crans.org>
+## 	- Yann Le Boulanger <asterix@lagaule.org>
 ## 	- Vincent Hanquez <tab@snarc.org>
 ##
-##	Copyright (C) 2003 Gajim Team
+##	Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/scripts/gajim b/scripts/gajim
index 6128db49a31b68dbd2fe8d28ffb2391770271647..b0a02bff5f861525028a37a9bfefd448ebe12b49 100644
--- a/scripts/gajim
+++ b/scripts/gajim
@@ -2,10 +2,10 @@
 ##      gajim
 ##
 ## Gajim Team:
-##      - Yann Le Boulanger <asterix@crans.org>
+##      - Yann Le Boulanger <asterix@lagaule.org>
 ##      - Vincent Hanquez <tab@snarc.org>
 ##
-##      Copyright (C) 2003 Gajim Team
+##      Copyright (C) 2003-2005 Gajim Team
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
diff --git a/setup_win32.py b/setup_win32.py
index f86b7800fadc3f3f45f86be5430b1233578da225..5bfea1db7c2d97b07c549ee711ee98d671486daa 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -1,3 +1,21 @@
+##      setup_win32.py
+##
+## Gajim Team:
+##      - Yann Le Boulanger <asterix@lagaule.org>
+##      - Vincent Hanquez <tab@snarc.org>
+##
+##      Copyright (C) 2003-2005 Gajim Team
+##
+## 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; version 2 only.
+##
+## 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.
+##
+
 from distutils.core import setup
 import py2exe
 import glob