diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..d55cd2a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,py,html}]
+indent_style = space
+indent_size = 4
+charset = utf-8
+
+[Makefile]
+indent_style = tab
diff --git a/oxtimelines/__init__.py b/oxtimelines/__init__.py
index 5515012..d724687 100644
--- a/oxtimelines/__init__.py
+++ b/oxtimelines/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 # GPL 2008-2014
 from __future__ import absolute_import
 
diff --git a/oxtimelines/ffmpeg.py b/oxtimelines/ffmpeg.py
index de965ee..3a0fac2 100644
--- a/oxtimelines/ffmpeg.py
+++ b/oxtimelines/ffmpeg.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 # GPL 2014
 from __future__ import division, with_statement, print_function
 
diff --git a/oxtimelines/timeline.py b/oxtimelines/timeline.py
index 39129cf..c426e19 100644
--- a/oxtimelines/timeline.py
+++ b/oxtimelines/timeline.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 # GPL 2008-2014
 from __future__ import division, print_function, absolute_import
 
diff --git a/setup.py b/setup.py
index e35b411..a0b123d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
 # setup.py
 # -*- coding: UTF-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
 try:
     from setuptools import setup
 except: