diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..60b5946
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,37 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# tab indentation
+[**.{c,h,c.in,hpp,cpp}]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+[sort_r.h]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+[**.{sql.in,sql}]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+
+
+# Matches the exact file .travis.yml
+[.travis.yml]
+indent_style = space
+indent_size = 2
+
diff --git a/.travis.yml b/.travis.yml
index f561e8e..da19883 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,10 @@ install:
 addons:
   postgresql: "9.3" # for "installcheck"
 
-before_script: ./autogen.sh
+before_script:
+  - npm install -g eclint
+  - eclint check * */* */cunit/*
+  - ./autogen.sh
 
 script:
   - ./configure CFLAGS="-Wall -O2 -g" --with-lazperf=/usr/local/