diff --git a/net-analyzer/check_mk/check_mk-1.2.4_p5.ebuild b/net-analyzer/check_mk/check_mk-1.2.4_p5.ebuild
index 389983f..03a5271 100644
--- a/net-analyzer/check_mk/check_mk-1.2.4_p5.ebuild
+++ b/net-analyzer/check_mk/check_mk-1.2.4_p5.ebuild
@@ -35,31 +35,21 @@ src_prepare() {
 
 src_configure() {
 	if has_version net-analyzer/nagios-core; then
-		export nagiosuser=nagios
-		export nagios_binary=/usr/sbin/nagios
-		export nagios_config_file=/etc/nagios/nagios.cfg
-		export nagconfdir=/etc/nagios/check_mk.d
-		export nagios_startscript=/etc/init.d/nagios
-		export nagpipe=/var/nagios/rw/nagios.cmd
-		export check_result_path=/var/nagios/spool/checkresults
-		export nagios_status_file=/var/nagios/status.dat
-		export htpasswd_file=/etc/nagios/htpasswd.users
+		export mydaemon=nagios
 		export nagios_auth_name="Nagios Access"
-		export rrd_path=/var/nagios/perfdata
 	else
-		export nagiosuser=icinga
-		export nagios_binary=/usr/sbin/icinga
-		export nagios_config_file=/etc/icinga/icinga.cfg
-		export nagconfdir=/etc/icinga/check_mk.d
-		export nagios_startscript=/etc/init.d/icinga
-		export nagpipe=/var/lib/icinga/rw/icinga.cmd
-		export check_result_path=/var/lib/icinga/spool/checkresults
-		export nagios_status_file=/var/lib/icinga/status.dat
-		export htpasswd_file=/etc/icinga/htpasswd.users
+		export mydaemon=icinga
 		export nagios_auth_name="Icinga Access"
-		export rrd_path=/var/lib/icinga/perfdata
 	fi
-
+	export nagiosuser=${mydaemon}
+	export nagios_binary=/usr/sbin/${mydaemon}
+	export nagios_config_file=/etc/${mydaemon}/${mydaemon}.cfg
+	export nagconfdir=/etc/${mydaemon}/check_mk.d
+	export nagios_startscript=/etc/init.d/${mydaemon}
+	export nagpipe=/var/lib/${mydaemon}/rw/${mydaemon}
+	export check_result_path=/var/lib/${mydaemon}/spool/checkresults
+	export nagios_status_file=/var/lib/${mydaemon}/status.dat
+	export rrd_path=/var/lib/${mydaemon}/perfdata
 	export docdir=/usr/share/doc/${PF}
 	export checkmandir=/usr/share/doc/${PF}/checks
 	export check_icmp_path=/usr/lib/nagios/plugins/check_icmp
@@ -89,14 +79,6 @@ src_compile() {
 }
 
 src_install() {
-	local mydaemon=
-
-	if has_version net-analyzer/nagios-core; then
-		mydaemon=nagios
-	else
-		mydaemon=icinga
-	fi
-
 	if ! use agent-only; then
 		# Apache configuration
 		insinto /etc/apache2/modules.d
@@ -134,7 +116,7 @@ EOF
 
 		# Nagios / Icinga check_mk templates
 		insinto /etc/${mydaemon}/check_mk.d
-		doins etc/icinga/check_mk.d/check_mk_templates.cfg
+		doins etc/${mydaemon}/check_mk.d/check_mk_templates.cfg
 
 		dobin usr/bin/check_mk
 		dobin usr/bin/mkp
@@ -146,8 +128,6 @@ EOF
 			rm "${S}"/usr/share/doc/${PF}/treasures/modbus/agent_modbus || die "Couldn't remove precompiled agent_modbus"
 		fi
 
-		#keepdir /usr/share/check_mk
-		#cp -R "${S}"/usr/share/check_mk/* "${D}"/usr/share/check_mk/ || die "copying files to ${D}/usr/share/check_mk/ failed!"
 		insinto /usr/share/check_mk
 		doins -r usr/share/check_mk/*
 
@@ -301,14 +281,6 @@ EOF
 }
 
 pkg_postinst() {
-	local mydaemon=
-
-	if has_version net-analyzer/nagios-core; then
-		mydaemon=nagios
-	else
-		mydaemon=icinga
-	fi
-
 	if ! use agent-only; then
 		elog "IMPORTANT: Please add the following line to your"
 		elog "/etc/${mydaemon}/${mydaemon}.cfg, so that"