diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 006df93d1ec1..bc373765bc3d 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nessus-plugins
 PORTVERSION=	2.2.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -22,8 +23,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/n
 RUN_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \
 		nmap:${PORTSDIR}/security/nmap
 
-BROKEN=		Incomplete pkg-plist
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
 
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 25c2a49862c4..93c648eb4fcf 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -12,6 +12,7 @@
 
 PORTNAME=	nessus
 PORTVERSION=	2.2.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
diff --git a/security/nessus/files/nessusd.sh.in b/security/nessus/files/nessusd.sh.in
index f5785a6405cd..63352c04c38d 100644
--- a/security/nessus/files/nessusd.sh.in
+++ b/security/nessus/files/nessusd.sh.in
@@ -30,8 +30,16 @@ nessusd_flags="-D"				# Flags to nessusd program
 name="nessusd"
 rcvar=`set_rcvar`
 command="${prefix}/sbin/nessusd"
-pidfile="/usr/local/var/nessus/nessusd.pid"
+pidfile="${prefix}/var/nessus/nessusd.pid"
 required_files="${prefix}/etc/nessus/nessusd.conf"
+start_precmd="nessus_check_certificate"
+
+nessus_check_certificate()
+{
+	if [ ! -f ${prefix}/var/CA/serverkey.pem ]; then
+		 ${prefix}/sbin/nessus-mkcert
+	fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index 5773a23214b3..53b81cf1b625 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -29,9 +29,9 @@ sbin/nessusd
 @dirrmtry var/nessus/jobs
 @dirrmtry var/nessus/logs
 @dirrmtry var/nessus/users
+var/nessus/nessus-services
 @dirrmtry var/nessus
 @dirrmtry etc/nessus
 @exec mkdir -p %D/lib/nessus/plugins
 @dirrmtry lib/nessus/plugins
 @dirrmtry lib/nessus
-@exec if [ ! -f %D/var/CA/serverkey.pem ]; then %D/sbin/nessus-mkcert; fi