diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..263b5431
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+# http://EditorConfig.org
+
+root = true
+
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+
+[{package.json,.travis.yml}]
+indent_size = 2
+
+
+[{*.md,*.jade}]
+trim_trailing_whitespace = false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33d618fb..c0fbeacf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 **h5ai** uses [semantic versioning](http://semver.org/).
 
 
+## develop
+
+* adds editorconfig
+
+
 ## v0.26.1 - *2014-08-17*
 
 * fixes links
diff --git a/README.md b/README.md
index b8a024ae..1eb5bd5f 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # h5ai
 
-[![license][license-img]][gh] [![web][web-img]][web] [![github][gh-img]][gh]
+[![license][license-img]][github] [![web][web-img]][web] [![github][github-img]][github]
 
 A modern HTTP web server index for Apache httpd, lighttpd, nginx and Cherokee.
-For bug reports and feature requests please use [issues][gh-issues].
+For bug reports and feature requests please use [issues][github-issues].
 
 
 ## Install
@@ -58,7 +58,7 @@ THE SOFTWARE.
 
 ## References
 
-**h5ai** profits from these great projects:  
+**h5ai** profits from these great projects:
 [GNOME Symbolic Icons](https://github.com/GNOME/gnome-icon-theme-symbolic) (CC BY-SA 3.0),
 [HTML5 ★ Boilerplate](http://html5boilerplate.com) (MIT),
 [jQuery](http://jquery.com) (MIT),
@@ -75,12 +75,12 @@ THE SOFTWARE.
 
 
 [web]: http://larsjung.de/h5ai/
-[gh]: https://github.com/lrsjng/h5ai
-[gh-issues]: https://github.com/lrsjng/h5ai/issues
+[github]: https://github.com/lrsjng/h5ai
+[github-issues]: https://github.com/lrsjng/h5ai/issues
 [release]: http://release.larsjung.de/h5ai/
 [develop]: http://release.larsjung.de/h5ai/develop/
 [fquery]: http://larsjung.de/fquery/
 
 [license-img]: http://img.shields.io/badge/license-MIT-a0a060.svg?style=flat-square
 [web-img]: http://img.shields.io/badge/web-larsjung.de/h5ai-a0a060.svg?style=flat-square
-[gh-img]: http://img.shields.io/badge/github-lrsjng/h5ai-a0a060.svg?style=flat-square
+[github-img]: http://img.shields.io/badge/github-lrsjng/h5ai-a0a060.svg?style=flat-square