diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..dc99d92
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+[*.{c,h,cpp,hpp}]
+indent_size = 4
\ No newline at end of file
diff --git a/Makefile b/Makefile
index ebc7687..0ac9b6b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-# 
+#
 # Use GNU-Make (gmake) for building
-# 
+#
+
 bin = aix-disk-perfstat
 src = $(wildcard *.c)
 obj = $(src:.c=.o)
@@ -14,4 +15,3 @@ $(bin): $(obj)
 .PHONY: clean
 clean:
 	rm -f $(obj) $(bin)
-