diff --git a/Makefile.am b/Makefile.am
index 28b45474c..6d4171efd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,13 +28,17 @@ icinga2doc_DATA = \
 	NEWS
 
 install-data-local:
-	$(MKDIR_P) $(DESTDIR)${localstatedir}/log/${PACKAGE}/compat/archives
-	$(MKDIR_P) $(DESTDIR)${localstatedir}/cache/${PACKAGE}
-	$(MKDIR_P) $(DESTDIR)${localstatedir}/spool/${PACKAGE}/perfdata
-	$(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE}/cluster/config
-	$(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE}/cluster/log
-	$(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE}
-	$(MKDIR_P) $(DESTDIR)${localstatedir}/run/${PACKAGE}
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/log/${PACKAGE}
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/log/${PACKAGE}/compat
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/log/${PACKAGE}/compat/archives
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/cache/${PACKAGE}
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/spool/${PACKAGE}
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/spool/${PACKAGE}/perfdata
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/lib/${PACKAGE}
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/lib/${PACKAGE}/cluster
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/lib/${PACKAGE}/cluster/config
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/lib/${PACKAGE}/cluster/log
+	$(INSTALL) -d $(INSTALL_OPTS) $(DESTDIR)${localstatedir}/run/${PACKAGE}
 	$(INSTALL) -m 775 -d $(COMMAND_OPTS) $(DESTDIR)${localstatedir}/run/${PACKAGE}/cmd
 	chmod g+s $(DESTDIR)${localstatedir}/run/${PACKAGE}/cmd
 
diff --git a/configure.ac b/configure.ac
index fb3b28de3..e041dd0d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_ARG_WITH(icinga_group,
 ACICINGA_CHECK_GROUP([$icinga_group], run)
 AC_SUBST(icinga_group)
 
-INSTALL_OPTS="-o $icinga_user -g $icinga_grp"
+INSTALL_OPTS="-o $icinga_user -g $icinga_group"
 AC_SUBST(INSTALL_OPTS)
 
 AC_ARG_WITH(icingacmd_user,