diff --git a/calibre-plugin/basicinihighlighter.py b/calibre-plugin/basicinihighlighter.py
index c4ea2c95..b948a565 100644
--- a/calibre-plugin/basicinihighlighter.py
+++ b/calibre-plugin/basicinihighlighter.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division,
                         print_function)
 
diff --git a/calibre-plugin/common_utils.py b/calibre-plugin/common_utils.py
index 9f135b4c..d032027e 100644
--- a/calibre-plugin/common_utils.py
+++ b/calibre-plugin/common_utils.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py
index 3fc7c64b..f04c9fdf 100644
--- a/calibre-plugin/config.py
+++ b/calibre-plugin/config.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
diff --git a/calibre-plugin/dialogs.py b/calibre-plugin/dialogs.py
index 7735774b..3b358213 100644
--- a/calibre-plugin/dialogs.py
+++ b/calibre-plugin/dialogs.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division,
                         print_function)
 
diff --git a/calibre-plugin/fff_plugin.py b/calibre-plugin/fff_plugin.py
index d7241e11..37ddde31 100644
--- a/calibre-plugin/fff_plugin.py
+++ b/calibre-plugin/fff_plugin.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
diff --git a/calibre-plugin/fff_util.py b/calibre-plugin/fff_util.py
index 0ba7227d..be351311 100644
--- a/calibre-plugin/fff_util.py
+++ b/calibre-plugin/fff_util.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
diff --git a/calibre-plugin/inihighlighter.py b/calibre-plugin/inihighlighter.py
index 2f34198a..7348d803 100644
--- a/calibre-plugin/inihighlighter.py
+++ b/calibre-plugin/inihighlighter.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division,
                         print_function)
 
diff --git a/calibre-plugin/jobs.py b/calibre-plugin/jobs.py
index f8ea695d..b962d9e2 100644
--- a/calibre-plugin/jobs.py
+++ b/calibre-plugin/jobs.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
diff --git a/calibre-plugin/prefs.py b/calibre-plugin/prefs.py
index 0dd8afd8..cc5350f7 100644
--- a/calibre-plugin/prefs.py
+++ b/calibre-plugin/prefs.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+# -*- coding: utf-8 -*-
+
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
diff --git a/fanficfare/epubutils.py b/fanficfare/epubutils.py
index deaa908f..5f021113 100644
--- a/fanficfare/epubutils.py
+++ b/fanficfare/epubutils.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# from __future__ import (unicode_literals, division, absolute_import,
-#                         print_function)
-
 __license__   = 'GPL v3'
 __copyright__ = '2015, Jim Miller'
 __docformat__ = 'restructuredtext en'