diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 8872a112b2b3..50d3ec0adfee 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -262,6 +262,7 @@
     SUBDIR += pixilate
     SUBDIR += pmacct
     SUBDIR += pnp
+    SUBDIR += pnp-icinga
     SUBDIR += portmon
     SUBDIR += py-flowtools
     SUBDIR += py-ipcalc
diff --git a/net-mgmt/pnp-icinga/Makefile b/net-mgmt/pnp-icinga/Makefile
new file mode 100644
index 000000000000..4ae3b46fef3c
--- /dev/null
+++ b/net-mgmt/pnp-icinga/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-icinga
+
+MAINTAINER=	lme@FreeBSD.org
+COMMENT=	Icinga performance data collector and grapher
+
+MASTERDIR=	${.CURDIR}/../pnp
+
+RUN_DEPENDS=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
+		icinga:${PORTSDIR}/net-mgmt/icinga
+
+NAGIOSDIR?=	/var/spool/icinga
+NAGIOSHTMURL?=	/icinga
+NAGIOSUSER?=	icinga
+NAGIOSGROUP?=	icinga
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index 89e0f677725b..ae4c87279d16 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -8,13 +8,13 @@ MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=pnp4nagios/PNP-0.6
 DISTNAME=	pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
-MAINTAINER=	rea@FreeBSD.org
-COMMENT=	Nagios performance data collector and grapher
+MAINTAINER?=	rea@FreeBSD.org
+COMMENT?=	Nagios performance data collector and grapher
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool
-RUN_DEPENDS=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
+RUN_DEPENDS?=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
 		nagios:${PORTSDIR}/net-mgmt/nagios
 
 MAKE_JOBS_UNSAFE=	yes