diff --git a/radicale.py b/radicale.py
index cd3876c5..96d52e0d 100755
--- a/radicale.py
+++ b/radicale.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/__init__.py b/radicale/__init__.py
index 1b65d96b..53daef74 100644
--- a/radicale/__init__.py
+++ b/radicale/__init__.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/acl/__init__.py b/radicale/acl/__init__.py
index 75b3052c..7d5463d3 100644
--- a/radicale/acl/__init__.py
+++ b/radicale/acl/__init__.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/acl/fake.py b/radicale/acl/fake.py
index e37cdc0e..5db12821 100644
--- a/radicale/acl/fake.py
+++ b/radicale/acl/fake.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/acl/htpasswd.py b/radicale/acl/htpasswd.py
index f764776f..d723994c 100644
--- a/radicale/acl/htpasswd.py
+++ b/radicale/acl/htpasswd.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/calendar.py b/radicale/calendar.py
index 5830a20e..2a3fe8e4 100644
--- a/radicale/calendar.py
+++ b/radicale/calendar.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/config.py b/radicale/config.py
index 1321a6e7..08a2da78 100644
--- a/radicale/config.py
+++ b/radicale/config.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/ical.py b/radicale/ical.py
index 2f1e8243..9227eeb9 100644
--- a/radicale/ical.py
+++ b/radicale/ical.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/support/__init__.py b/radicale/support/__init__.py
index cc4df883..169496e9 100644
--- a/radicale/support/__init__.py
+++ b/radicale/support/__init__.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/support/plain.py b/radicale/support/plain.py
index b8c276c0..bf599578 100644
--- a/radicale/support/plain.py
+++ b/radicale/support/plain.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/radicale/xmlutils.py b/radicale/xmlutils.py
index bbf6380a..6c912a59 100644
--- a/radicale/xmlutils.py
+++ b/radicale/xmlutils.py
@@ -1,7 +1,7 @@
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2009 Guillaume Ayoub
+# Copyright © 2008-2010 Guillaume Ayoub
 # Copyright © 2008 Nicolas Kandel
 # Copyright © 2008 Pascal Halter
 #
diff --git a/setup.py b/setup.py
index 1e7309d2..85358d17 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python
-# -*- coding: utf-8; indent-tabs-mode: nil; -*-
+# -*- coding: utf-8 -*-
 #
 # This file is part of Radicale Server - Calendar Server
-# Copyright © 2009 Guillaume Ayoub
+# Copyright © 2009-2010 Guillaume Ayoub
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by