diff --git a/bin/update-dotfiles.sh b/bin/update-dotfiles.sh
index 5c683b5..81c3425 100755
--- a/bin/update-dotfiles.sh
+++ b/bin/update-dotfiles.sh
@@ -15,7 +15,7 @@
 dir=$DOTFILES_DIR
 
 # list of files/folders to symlink in homedir
-files="aliases bashrc bash_profile bash_paths bash_prompt exports gemrc gitconfig gitignore hushlogin inputrc private npmrc bin"
+files="aliases bashrc bash_profile bash_paths bash_prompt editorconfig exports gemrc gitconfig gitignore hushlogin inputrc private npmrc bin"
 
 
 # ----------------------------------------------------------------------
diff --git a/editorconfig b/editorconfig
new file mode 100644
index 0000000..f16358e
--- /dev/null
+++ b/editorconfig
@@ -0,0 +1,13 @@
+#
+# Global EditorConfig file
+# http://EditorConfig.org
+#
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+[{**.js,package.json,.travis.yml}]
+indent_style = space
+indent_size = 2