diff --git a/net-mgmt/pandorafms_agent/Makefile b/net-mgmt/pandorafms_agent/Makefile
index 425714f8be39..6782a1a4d4ef 100644
--- a/net-mgmt/pandorafms_agent/Makefile
+++ b/net-mgmt/pandorafms_agent/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	pandora_agent
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	koichiro@rworks.jp
 COMMENT=	Pandora FMS agent, Perl version
 WWW=		https://www.pandorafms.com/
 
 LICENSE=	${PANDORA_LICENSE}
 LICENSE_FILE=	${PANDORA_LICENSE_FILE}
 
 OPTIONS_DEFINE=		DOCS TENTACLE_SERVER
 OPTIONS_DEFAULT=	TENTACLE_SERVER
 TENTACLE_SERVER_DESC=	Install tentalce_server
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	plugins/pandora_netusage
 
 SUB_FILES=	pkg-message
 
 .include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk"
 
 PORTDOCS+=	README
 PANDORA_INSTALLER_ARGS+=	--fakeroot
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MTENTACLE_SERVER}
 CONFLICTS=	pandora_server-[45]*
 PLIST_SUB+=	TENTACLE_SERVER=""
 .else
 PLIST_SUB+=	TENTACLE_SERVER="@comment "
 PANDORA_INSTALLER_ARGS+=	--no-tentacle-server
 .endif
 
 PANDORA_INSTALLER_ARGS+=	${STAGEDIR} root ${PERL}
 
 post-patch:
 	@${REINPLACE_CMD} -e '\|PREFIX=|s|=[^;]*|=${PREFIX}|' ${WRKSRC}/pandora_agent_installer
 
 post-install:
 	@${RM} ${STAGEDIR}${LOGDIR}/pandora_agent.log
 	@${RM} ${STAGEDIR}${DATADIR}/collections/.empty
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MV} ${STAGEDIR}${ETCDIR}/pandora_agent.conf ${STAGEDIR}${ETCDIR}/pandora_agent.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/pandorafms_agent/files/patch-pandora__agent__installer b/net-mgmt/pandorafms_agent/files/patch-pandora__agent__installer
index 61a71caf4bb7..48f8710be813 100644
--- a/net-mgmt/pandorafms_agent/files/patch-pandora__agent__installer
+++ b/net-mgmt/pandorafms_agent/files/patch-pandora__agent__installer
@@ -1,17 +1,25 @@
---- pandora_agent_installer.orig	2019-08-12 10:17:59 UTC
+--- pandora_agent_installer.orig	2016-04-08 09:51:58 UTC
 +++ pandora_agent_installer
-@@ -88,13 +88,9 @@ fi
+@@ -49,7 +49,6 @@ FreeBSD)
+ 	;;
+ FreeBSD)
+ 	PANDORA_CFG=$PREFIX/etc/pandora
+-	PANDORA_MAN=$PREFIX/man
+ 	PANDORA_STARTUP=$PREFIX/etc/rc.d/pandora_agent
+ 	DAEMON_SCRIPT=$OS_NAME/pandora_agent
+ 	PANDORA_PERL_PATH=/usr/local/bin/perl
+@@ -88,13 +87,9 @@ fi
  
  [ "$4" ] && PANDORA_PERL_PATH=$4
  
 -# Check for Perl 5.6.x or higher available
 -PERL_VERSION=`$PANDORA_PERL_PATH -v | egrep 'v5.[6-9]|v5.[12][0-9]' | grep perl`
 -
 -if [ -z "$PERL_VERSION" ]
 +if ! perl -M5.006 -e 1
  then
  	echo "Perl 5.6.x or higher is not detected. This is required for Pandora FMS"
 -	echo "Detected: $PERL_VERSION "
  	echo "Aborting install..."
  	exit 2
  fi
diff --git a/net-mgmt/pandorafms_agent/pkg-plist b/net-mgmt/pandorafms_agent/pkg-plist
index 03603d5a64a3..68e3d78d9ef0 100644
--- a/net-mgmt/pandorafms_agent/pkg-plist
+++ b/net-mgmt/pandorafms_agent/pkg-plist
@@ -1,27 +1,27 @@
 @mode 555
 bin/pandora_agent
 bin/pandora_agent_exec
 bin/pandora_revent
 %%TENTACLE_SERVER%%bin/tentacle_server
 bin/tentacle_client
 etc/rc.d/pandora_agent
 @sample(pandora,,400) %%ETCDIR%%/pandora_agent.conf.sample
-man/man1/tentacle_client.1.gz
-man/man1/pandora_agent.1.gz
+share/man/man1/tentacle_client.1.gz
+share/man/man1/pandora_agent.1.gz
 @mode 555
 %%DATADIR%%/plugins/files_indir
 %%DATADIR%%/plugins/grep_log
 %%DATADIR%%/plugins/grep_log_module
 %%DATADIR%%/plugins/inventory
 %%DATADIR%%/plugins/nagios_plugin_wrapper
 %%DATADIR%%/plugins/pandora_df
 %%DATADIR%%/plugins/pandora_df_free
 %%DATADIR%%/plugins/pandora_mem
 %%DATADIR%%/plugins/pandora_netusage
 %%DATADIR%%/plugins/pandora_update
 %%DATADIR%%/plugins/top.sh
 %%DATADIR%%/plugins/who.sh
 @dir(pandora,,700) %%DATADIR%%/collections
 @dir(pandora,,700) %%DATADIR%%/plugins
 %%ETCDIR%%/plugins
 %%ETCDIR%%/collections