diff --git a/Makefile.in b/Makefile.in
index 11a36bf1d..48088664c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ default:
 #
 # Installs the whole application w\o httpd configurations
 #
-install: install-static-files install-runtime-dirs
+install: install-static-files install-runtime-dirs ensure-writable-folders
 
 update: install-application
 #
@@ -34,7 +34,7 @@ clean:
 # Installs/copies all static files (executables, scripts, html, etc)
 #
 install-static-files: install-application copy-web-files-public copy-web-files-config copy-web-files-modules
-#	$(INSTALL) -m 644 $(INSTALL_OPTS) "./public/.htaccess"  $(DESTDIR)$(prefix)/public/.htaccess;
+	$(INSTALL) -m 644 $(INSTALL_OPTS) "./public/.htaccess"  $(DESTDIR)$(prefix)/public/.htaccess;
 
 #
 # Installs runtime directories like the application cache
@@ -56,7 +56,7 @@ install-apache-config:
 #
 # Installs the php files to the prefix
 #
-install-application: copy-web-files-application copy-web-files-library
+install-application: copy-web-files-application copy-web-files-library 
 
 #
 # Rule for coying folders and containing files (arbitary types), hidden files are excluded
@@ -76,6 +76,12 @@ copy-folder-%:
 		done
 
 
+ensure-writable-folders:
+	$(INSTALL) -m 775 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/var/
+	$(INSTALL) -m 775 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/var/log
+	chmod 775 -R $(DESTDIR)$(prefix)/config
+
+
 #
 # Rule for copying only php, *html, js and ini files. Hidden files are ignored
 #
diff --git a/config/authentication.ini.in b/config/authentication.ini.in
old mode 100644
new mode 100755
index 35c70c63f..e65561981
--- a/config/authentication.ini.in
+++ b/config/authentication.ini.in
@@ -30,4 +30,4 @@
 @use_internal_auth@[internal_authentication]
 @use_internal_auth@backend     = db
 @use_internal_auth@target      = "user"
-@use_internal_auth@resource    = "authentication_db"
+@use_internal_auth@resource    = "internal_db"
diff --git a/config/modules/monitoring/backends.ini.in b/config/modules/monitoring/backends.ini.in
index 2d33fcecc..c763f076a 100644
--- a/config/modules/monitoring/backends.ini.in
+++ b/config/modules/monitoring/backends.ini.in
@@ -1,18 +1,15 @@
 [localdb]
 type = ido
 resource = "ido"
-@ido_enabled@
 
 [locallive]
 type = livestatus
 socket = @livestatus_socket@
-@livestatus_enabled@
 
 [localfile]
 type = statusdat
 status_file = @statusdat_file@
 objects_file = @objects_cache_file@
-@statusdat_enabled@
 
 ;[localfailsafe]
 ;enabled=false
diff --git a/config/resources.ini.in b/config/resources.ini.in
index 32514b84c..5cf86e817 100644
--- a/config/resources.ini.in
+++ b/config/resources.ini.in
@@ -3,7 +3,7 @@
 ; The configuration file *resources.ini* contains data sources that
 ; can be referenced in other configurations. This allows you to manage
 ; all connections to SQL databases in one single place, avoiding the need
-: to edit several different configuration files, when the connection
+; to edit several different configuration files, when the connection
 ; information of a resource change.
 ;
 ; Each section represents a resource, with the section name being the
@@ -17,9 +17,9 @@
 type                = db
 db                  = @internal_db_type@
 host                = @internal_db_host@
-password            = @internal_db_password@
+password            = @internal_db_pass@
 username            = @internal_db_user@
-dbname              = @internal_db_database@
+dbname              = @internal_db_name@
 
 [ido]
 type                = db
diff --git a/doc/installation.md b/doc/installation.md
index b0633d1e6..177c0aab1 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -8,11 +8,9 @@
 If you like to configurea and install icinga2-web from the command line or 
 if you want to create packages, configure and make is the best choice for installation.
 
+    ./configure && make install && make install-apache2-config
 
-`
-./configure && make install && make install-apache2-config
-`
-will install the application to the default target (/usr/local/icinga2-web). Also 
+will install the application to the default target (/usr/local/icinga2-web). Also
 an apache configuration entry is added to your apache server, so you should restart
 your web server according to your systems configuration.
 
@@ -20,9 +18,9 @@ your web server according to your systems configuration.
 
 If you want to install the application to a different directory, use the --prefix flag in your 
 configure call:
-`
-./configure --prefix=/my/target/directory
-`
+
+    ./configure --prefix=/my/target/directory
+
 
 ### Authentication