diff --git a/bin/cc-node b/bin/cc-node
index e74923d12b70943cf968578afacadfe9f743990f..ad9fa1f4ee3e21f306cb36919f03aaa4115ac657 100755
--- a/bin/cc-node
+++ b/bin/cc-node
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#coding=utf8
+# -*- coding: utf-8 -*-
 
 from optparse import OptionParser
 from sjrpc.core import RpcError
diff --git a/ccnode/__init__.py b/ccnode/__init__.py
index a263d419836af2112dcd9b1e2d4662b683ddecef..11ec6221853b374c7902ab94f8d71e508c2afb03 100644
--- a/ccnode/__init__.py
+++ b/ccnode/__init__.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#coding:utf-8
+# -*- coding: utf-8 -*-
 
 """
 
diff --git a/ccnode/ccnode.py b/ccnode/ccnode.py
index c873b0334bfbd60faaffc681b38071b57573d95e..c060bfd87863de4c0e6237927ba886a537eac492 100644
--- a/ccnode/ccnode.py
+++ b/ccnode/ccnode.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 import socket
 import threading
diff --git a/ccnode/common.py b/ccnode/common.py
index 8eaf41bde800cf9e35ed9f0824c413a450b75f9a..1c37841f34363ccb860502f10dd1bdc38e9df4a6 100644
--- a/ccnode/common.py
+++ b/ccnode/common.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 import os
 import re
diff --git a/ccnode/exceptions.py b/ccnode/exceptions.py
index 78dd8d73817c48b646b8f64cfebe23e3452a1e35..f4c30d4da165586a40bd7b655b68586b1a5154bb 100644
--- a/ccnode/exceptions.py
+++ b/ccnode/exceptions.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 class CCException(Exception):
     
diff --git a/ccnode/kvm.py b/ccnode/kvm.py
index fa396093bea31b04c86bad93845a10b49e675cd6..e3b89c08242ad819a86c251f433f395172a7be4b 100644
--- a/ccnode/kvm.py
+++ b/ccnode/kvm.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 from libvirtwrapper import LibvirtHypervisor
 
diff --git a/ccnode/libvirtwrapper.py b/ccnode/libvirtwrapper.py
index 1638ed1fe620321e5fdb5f4745717cdcb1a952dd..97dec0214102583791e81f9b99f5ba6054fd7286 100644
--- a/ccnode/libvirtwrapper.py
+++ b/ccnode/libvirtwrapper.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 import libvirt
 import re