diff --git a/GNUmakefile b/GNUmakefile
index 49d09179e9..399a675785 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -54,10 +54,18 @@ add-maintainer:
 	@echo adding generated files to GIT
 	git add -f $(MAINTAINER)
 
+remove-maintainer:
+	@echo removing generated files from GIT
+	git rm -f $(MAINTAINER)
+
 add-automagic:
 	@echo adding automagic files to GIT
 	git add -f $(AUTOMAGIC)
 
+remove-automagic:
+	@echo removing automagic files from GIT
+	git rm -f $(AUTOMAGIC)
+
 ################################################################################
 ### @brief make love
 ################################################################################
diff --git a/Makefile.am b/Makefile.am
index 8ae9a50c3d..7c102615fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -378,9 +378,11 @@ BUILT_SOURCES += README
 
 README: README.md
 	fgrep -v "[Build Status]" $< \
+		| fgrep -v "ArangoDB-Logo" \
 		| @MARKDOWN_EXEC@ \
 		| @HTML2TEXT_EXEC@ -style pretty -nobs \
 		| sed -e 's:&gt;:>:g' \
+                | awk 'BEGIN { s = 0; } { if (length($0) == 0) {if (s != 0) print $0;} else {s = 1; print $0; }}' \
 		> $@.tmp
 	mv $@.tmp $@
 
diff --git a/Makefile.in b/Makefile.in
index 3d75b24bf1..98f953c6f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6161,9 +6161,11 @@ html/admin/js/modules/%.js: @srcdir@/js/client/modules/%.js .setup-js-directorie
 
 @ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@README: README.md
 @ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@	fgrep -v "[Build Status]" $< \
+@ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@		| fgrep -v "ArangoDB-Logo" \
 @ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@		| @MARKDOWN_EXEC@ \
 @ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@		| @HTML2TEXT_EXEC@ -style pretty -nobs \
 @ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@		| sed -e 's:&gt;:>:g' \
+@ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@                | awk 'BEGIN { s = 0; } { if (length($0) == 0) {if (s != 0) print $0;} else {s = 1; print $0; }}' \
 @ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@		> $@.tmp
 @ENABLE_HTML2TEXT_TRUE@@ENABLE_MARKDOWN_TRUE@	mv $@.tmp $@
 
diff --git a/README.md b/README.md
index 206d174c6b..bc85df455f 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,8 @@ For Linux use the distribution dependend package manager, see
 [Installation Manual](http://www.arangodb.org/manuals/current/Installing.html)
 for details.
 
-For Windows users: we are working hard on a Windows version. A first version will become available soon.
+For Windows users: We provide an installer script on our 
+[download page](http://www.arangodb.org/download).
 
 If the package manager has not already started the ArangoDB server, use