diff --git a/src/icalendar/__init__.py b/src/icalendar/__init__.py
index fa32544..a1aee28 100644
--- a/src/icalendar/__init__.py
+++ b/src/icalendar/__init__.py
@@ -23,6 +23,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # Components
+
 from icalendar.cal import Calendar, Event, Todo, Journal
 from icalendar.cal import FreeBusy, Timezone, Alarm, ComponentFactory
 
diff --git a/src/icalendar/cal.py b/src/icalendar/cal.py
index e571277..6ddf457 100644
--- a/src/icalendar/cal.py
+++ b/src/icalendar/cal.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Copyright (c) 2012, Plone Foundation
 # All rights reserved.
 #
@@ -22,7 +24,6 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# -*- coding: latin-1 -*-
 
 """
 
diff --git a/src/icalendar/caselessdict.py b/src/icalendar/caselessdict.py
index e175552..e7f57e6 100644
--- a/src/icalendar/caselessdict.py
+++ b/src/icalendar/caselessdict.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Copyright (c) 2012, Plone Foundation
 # All rights reserved.
 #
@@ -22,7 +24,6 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# -*- coding: latin-1 -*-
 
 def canonsort_keys(keys, canonical_order=None):
     """
diff --git a/src/icalendar/interfaces.py b/src/icalendar/interfaces.py
index a84cf25..d0e83c4 100644
--- a/src/icalendar/interfaces.py
+++ b/src/icalendar/interfaces.py
@@ -22,6 +22,7 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 try:
     from zope.interface import Interface, Attribute
 except ImportError:
diff --git a/src/icalendar/tools.py b/src/icalendar/tools.py
index 94edfee..2d66d37 100644
--- a/src/icalendar/tools.py
+++ b/src/icalendar/tools.py
@@ -22,6 +22,7 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 """ This module contains non-essential tools for iCalendar. Pretty thin so far
 eh?
 """