diff --git a/net-mgmt/cnagios/Makefile b/net-mgmt/cnagios/Makefile
index 6e639bddaafe..1e32e619f56c 100644
--- a/net-mgmt/cnagios/Makefile
+++ b/net-mgmt/cnagios/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	cnagios
 PORTVERSION=	0.33
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	danny@dannywarren.com
 COMMENT=	Curses-based interface for nagios
 WWW=		https://github.com/dannywarren/cnagios
 
 LICENSE=	ISCL
 
 FLAVORS=	nagios3 nagios4
 
 USES=		ncurses perl5
 
 nagios3_PKGNAMESUFFIX=	-nagios3
 nagios4_PKGNAMESUFFIX=	-nagios4
 
 nagios3_RUN_DEPENDS=	nagios>=3.0:net-mgmt/nagios
 nagios4_RUN_DEPENDS=	nagios4>=4.0:net-mgmt/nagios4
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dannywarren
 
 CONFLICTS_INSTALL=	cnagios-nagios* # bin/cnagios
 
 NAGIOSDIR?=	/var/spool/nagios
 ETCDIR=		${PREFIX}/etc/nagios
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-etc-dir="${ETCDIR}" \
 		--with-var-dir="${NAGIOSDIR}" \
 		--with-status-file="${NAGIOSDIR}/status.dat" \
 		--with-nagios-data=3
 MAKE_ARGS=	LIBS="-lncurses"
 ALL_TARGET=	cnagios
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cnagios
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/cnagios/files/patch-Makefile.in b/net-mgmt/cnagios/files/patch-Makefile.in
index 636749a7ac5e..e4af6c80c3b6 100644
--- a/net-mgmt/cnagios/files/patch-Makefile.in
+++ b/net-mgmt/cnagios/files/patch-Makefile.in
@@ -1,47 +1,47 @@
 --- Makefile.in.orig	2015-05-15 16:31:56 UTC
 +++ Makefile.in
 @@ -27,39 +27,11 @@ cnagios: $(OBJS) $(HDRS)
  
  
  install:
 -	@if [ -f @prefix@/bin/cnagios ]; then \
 -	  echo mv @prefix@/bin/cnagios @prefix@/bin/cnagios.OLD ; \
 -	  mv @prefix@/bin/cnagios @prefix@/bin/cnagios.OLD ; \
 -	fi
 -	@echo installing cnagios in @prefix@/bin
 -	@$(INSTALL) -c -m 755 cnagios @prefix@/bin/cnagios
 -
 -	@echo installing cnagios.1 in @prefix@/man/man1
 -	@$(INSTALL) -c -m 755 cnagios.1 @prefix@/man/man1/cnagios.1
 -
 -	@if [ ! -f @NAGIOS_ETC_DIR@/cnagiosrc ]; then \
 -	  echo installing cnagiosrc in @NAGIOS_ETC_DIR@ ; \
 -	  $(INSTALL) -c -m 644 cnagiosrc @NAGIOS_ETC_DIR@/cnagiosrc ; \
 -	else \
 -	  echo installing cnagiosrc as @NAGIOS_ETC_DIR@/cnagiosrc.NEW ; \
 -	  $(INSTALL) -c -m 644 cnagiosrc @NAGIOS_ETC_DIR@/cnagiosrc.NEW ; \
 -	fi
 -
 -	@if [ ! -f @NAGIOS_ETC_DIR@/cnagios.help ]; then \
 -	  echo installing cnagios.help in @NAGIOS_ETC_DIR@ ; \
 -	  $(INSTALL) -c -m 644 cnagios.help @NAGIOS_ETC_DIR@/cnagios.help ; \
 -	else \
 -	  echo installing cnagios.help as @NAGIOS_ETC_DIR@/cnagios.help.NEW ; \
 -	  $(INSTALL) -c -m 644 cnagios.help @NAGIOS_ETC_DIR@/cnagios.help.NEW ; \
 -	fi
 -
 -	@if [ ! -f @NAGIOS_ETC_DIR@/cnagios.pl ]; then \
 -	  echo installing cnagios.pl in @NAGIOS_ETC_DIR@ ; \
 -	  $(INSTALL) -c -m 644 cnagios.pl @NAGIOS_ETC_DIR@/cnagios.pl ; \
 -	else \
 -	  echo installing cnagios.pl as @NAGIOS_ETC_DIR@/cnagios.pl.NEW ; \
 -	  $(INSTALL) -c -m 644 cnagios.pl @NAGIOS_ETC_DIR@/cnagios.pl.NEW ; \
 -	fi
 +	$(INSTALL) -c -m 755 cnagios $(DESTDIR)@prefix@/bin/cnagios
-+	$(INSTALL) -c -m 444 cnagios.1 $(DESTDIR)@prefix@/man/man1/cnagios.1
++	$(INSTALL) -c -m 444 cnagios.1 $(DESTDIR)@prefix@/share/man/man1/cnagios.1
 +	$(INSTALL) -c -m 644 cnagiosrc $(DESTDIR)@NAGIOS_ETC_DIR@/cnagiosrc.sample
 +	$(INSTALL) -c -m 644 cnagios.help $(DESTDIR)@NAGIOS_ETC_DIR@/cnagios.help.sample
 +	$(INSTALL) -c -m 644 cnagios.pl $(DESTDIR)@NAGIOS_ETC_DIR@/cnagios.pl.sample
  
  install2:
  	@if [ -f /usr/local/bin/cnagios ]; then \
diff --git a/net-mgmt/cnagios/pkg-plist b/net-mgmt/cnagios/pkg-plist
index 5ac794a5a8cb..56337dafe0a9 100644
--- a/net-mgmt/cnagios/pkg-plist
+++ b/net-mgmt/cnagios/pkg-plist
@@ -1,5 +1,5 @@
 bin/cnagios
 @sample %%ETCDIR%%/cnagios.help.sample
 @sample %%ETCDIR%%/cnagios.pl.sample
 @sample %%ETCDIR%%/cnagiosrc.sample
-man/man1/cnagios.1.gz
+share/man/man1/cnagios.1.gz