diff --git a/net-mgmt/icli/Makefile b/net-mgmt/icli/Makefile
index 7f76ed21fecc..33fe104df081 100644
--- a/net-mgmt/icli/Makefile
+++ b/net-mgmt/icli/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	icli
-DISTVERSION=	0.46
-PORTREVISION=	1
+DISTVERSION=	0.47
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	http://finalrewind.org/projects/icli/
 
@@ -18,13 +17,16 @@ RUN_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
 		p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
 		icinga:${PORTSDIR}/net-mgmt/icinga
 
-CONFIGURE_ARGS+=	--destdir ${STAGEDIR}
+ICINGADIR?=	/var/spool/icinga
+
+CONFIGURE_ARGS+=	--destdir ${STAGEDIR} \
+			--icli-object-file=${ICINGADIR}/objects.cache \
+                	--icli-status-file=${ICINGADIR}/status.dat \
+                	--icli-command-file=${ICINGADIR}/icinga.cmd
 
 USES=		perl5
 USE_PERL5=	modbuild
 
-PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
-
 post-patch:
 		@${REINPLACE_CMD} -i '' 's|/var/[^/]*/icinga|/var/spool/icinga|' \
 			${WRKSRC}/bin/${PORTNAME}
diff --git a/net-mgmt/icli/distinfo b/net-mgmt/icli/distinfo
index c76e4a6726ed..87caa8ba45e4 100644
--- a/net-mgmt/icli/distinfo
+++ b/net-mgmt/icli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icli-0.46.tar.gz) = cf63d74fe99288b8b6c77e9e5fe258fc9d7c6546a7fbc5c0cae04fe1ed4d5106
-SIZE (icli-0.46.tar.gz) = 35591
+SHA256 (icli-0.47.tar.gz) = 63f3d375e363da38e1c4d8f76dc631da40c09d3496085690c8778afcb3608cf9
+SIZE (icli-0.47.tar.gz) = 37152
diff --git a/net-mgmt/icli/pkg-plist b/net-mgmt/icli/pkg-plist
new file mode 100644
index 000000000000..bb3ad88ac610
--- /dev/null
+++ b/net-mgmt/icli/pkg-plist
@@ -0,0 +1,8 @@
+bin/icli
+%%PERL5_MAN3%%/App::Icli.3.gz
+%%PERL5_MAN3%%/App::Icli::ConfigData.3.gz
+%%SITE_PERL%%/App/Icli.pm
+%%SITE_PERL%%/App/Icli/ConfigData.pm
+man/man1/icli.1.gz
+@dirrmtry %%SITE_PERL%%/App/Icli
+@dirrmtry %%SITE_PERL%%/App