24 files changed, 496 insertions, 194 deletions

diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index 245013226e5f..72d5a29fd058 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	nessus
-PORTVERSION=	0.99.7
+PORTVERSION=	1.0.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
-DISTNAME=	nessus-core-0.99.7
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
+DISTNAME=	nessus-core-1.0.4
 
 MAINTAINER=	anders@fix.no
 
-LIB_DEPENDS=	nasl.99:${PORTSDIR}/security/nessus-libnasl \
+LIB_DEPENDS=	nasl.1:${PORTSDIR}/security/nessus-libnasl \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 NESSUS_REV=	${DISTNAME:S/nessus-core-//g}
@@ -33,7 +33,7 @@ WRKSRC=		${WRKDIR}/nessus-core
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GTKCONFIG="${GTK_CONFIG}"
 MAN1=		nessus.1
-MAN8=		nessusd.8
+MAN8=		nessusd.8 nessus-adduser.8
 
 post-install:
 		@${ECHO} "=========================================================="
diff --git a/security/nessus-devel/distinfo b/security/nessus-devel/distinfo
index 0afeb930012f..26db817bee21 100644
--- a/security/nessus-devel/distinfo
+++ b/security/nessus-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-0.99.7.tar.gz) = 45001a660027713b4d8d2493cbcac80d
+MD5 (nessus/nessus-core-1.0.4.tar.gz) = b6d66f613b3c45526195df9e0087dd63
diff --git a/security/nessus-devel/pkg-plist b/security/nessus-devel/pkg-plist
index f4f54a312a43..24f36bda5e19 100644
--- a/security/nessus-devel/pkg-plist
+++ b/security/nessus-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/nessus
+sbin/nessus-adduser
 include/nessus/config.h
 include/nessus/includes.h
 include/nessus/nessus-devel.h
@@ -11,6 +12,3 @@ include/nessus/ntcompat.h
 sbin/nessusd
 @dirrm var/nessus
 @dirrm etc/nessus
-@dirrm lib/nessus/plugins
-@dirrm lib/nessus/reports
-@dirrm lib/nessus
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index ec2d5ada1827..b01f369ed831 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -6,22 +6,25 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	0.99.7
+PORTVERSION=	1.0.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
-DISTNAME=	libnasl-0.99.7
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
+DISTNAME=	libnasl-1.0.4
+
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	libnasl-patch-1
 
 MAINTAINER=	anders@fix.no
 
-LIB_DEPENDS=	nessus.99:${PORTSDIR}/security/nessus-libraries
+LIB_DEPENDS=	nessus.1:${PORTSDIR}/security/nessus-libraries
 
 NESSUS_REV=	${DISTNAME:S/libnasl-//g}
 
@@ -30,6 +33,6 @@ WRKSRC=		${WRKDIR}/libnasl
 
 USE_LIBTOOL=	YES
 
-MAN1=		nasl-config.1
+MAN1=		nasl.1 nasl-config.1
 
 .include <bsd.port.mk>
diff --git a/security/nessus-libnasl-devel/distinfo b/security/nessus-libnasl-devel/distinfo
index 083fbe99de0f..f380c4501868 100644
--- a/security/nessus-libnasl-devel/distinfo
+++ b/security/nessus-libnasl-devel/distinfo
@@ -1 +1,2 @@
-MD5 (nessus/libnasl-0.99.7.tar.gz) = fbf4eed7fbefc90338179d9559fcfc8d
+MD5 (nessus/libnasl-1.0.4.tar.gz) = 3a91b6d6a42b8b73124990a13bbd0da2
+MD5 (nessus/libnasl-patch-1) = a5588935d8d656de4ac3b95e8d3484ea
diff --git a/security/nessus-libnasl-devel/pkg-plist b/security/nessus-libnasl-devel/pkg-plist
index 499cc480e7af..b05bd425920a 100644
--- a/security/nessus-libnasl-devel/pkg-plist
+++ b/security/nessus-libnasl-devel/pkg-plist
@@ -1,5 +1,6 @@
 lib/libnasl.a
 lib/libnasl.so
-lib/libnasl.so.99
+lib/libnasl.so.1
 include/nessus/nasl.h
+bin/nasl
 bin/nasl-config
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index ec2d5ada1827..b01f369ed831 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -6,22 +6,25 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	0.99.7
+PORTVERSION=	1.0.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
-DISTNAME=	libnasl-0.99.7
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
+DISTNAME=	libnasl-1.0.4
+
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	libnasl-patch-1
 
 MAINTAINER=	anders@fix.no
 
-LIB_DEPENDS=	nessus.99:${PORTSDIR}/security/nessus-libraries
+LIB_DEPENDS=	nessus.1:${PORTSDIR}/security/nessus-libraries
 
 NESSUS_REV=	${DISTNAME:S/libnasl-//g}
 
@@ -30,6 +33,6 @@ WRKSRC=		${WRKDIR}/libnasl
 
 USE_LIBTOOL=	YES
 
-MAN1=		nasl-config.1
+MAN1=		nasl.1 nasl-config.1
 
 .include <bsd.port.mk>
diff --git a/security/nessus-libnasl/distinfo b/security/nessus-libnasl/distinfo
index 083fbe99de0f..f380c4501868 100644
--- a/security/nessus-libnasl/distinfo
+++ b/security/nessus-libnasl/distinfo
@@ -1 +1,2 @@
-MD5 (nessus/libnasl-0.99.7.tar.gz) = fbf4eed7fbefc90338179d9559fcfc8d
+MD5 (nessus/libnasl-1.0.4.tar.gz) = 3a91b6d6a42b8b73124990a13bbd0da2
+MD5 (nessus/libnasl-patch-1) = a5588935d8d656de4ac3b95e8d3484ea
diff --git a/security/nessus-libnasl/pkg-plist b/security/nessus-libnasl/pkg-plist
index 499cc480e7af..b05bd425920a 100644
--- a/security/nessus-libnasl/pkg-plist
+++ b/security/nessus-libnasl/pkg-plist
@@ -1,5 +1,6 @@
 lib/libnasl.a
 lib/libnasl.so
-lib/libnasl.so.99
+lib/libnasl.so.1
 include/nessus/nasl.h
+bin/nasl
 bin/nasl-config
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index 57baccb9e582..e2c415e75d82 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	0.99.7
+PORTVERSION=	1.0.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
 
 MAINTAINER=	anders@fix.no
 
diff --git a/security/nessus-libraries-devel/distinfo b/security/nessus-libraries-devel/distinfo
index 03ecaedfcea9..2a84bd708a43 100644
--- a/security/nessus-libraries-devel/distinfo
+++ b/security/nessus-libraries-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-0.99.7.tar.gz) = 11fdeaae5b1c705b6222523c9540ae11
+MD5 (nessus/nessus-libraries-1.0.4.tar.gz) = 1fe60e282532c6018ed402a275903c15
diff --git a/security/nessus-libraries-devel/pkg-plist b/security/nessus-libraries-devel/pkg-plist
index de4f8b06ea68..ce2d1242548c 100644
--- a/security/nessus-libraries-devel/pkg-plist
+++ b/security/nessus-libraries-devel/pkg-plist
@@ -1,19 +1,18 @@
 lib/libhosts_gatherer.a
 lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.99
+lib/libhosts_gatherer.so.1
 lib/libnessus.a
 lib/libnessus.so
-lib/libnessus.so.99
+lib/libnessus.so.1
 lib/libpcap-nessus.a
 lib/libpcap-nessus.so
-lib/libpcap-nessus.so.99
+lib/libpcap-nessus.so.1
 lib/libpeks.a
 lib/libpeks.so
-lib/libpeks.so.0
-lib/libpeksmp.a
+lib/libpeks.so.8
+lib/libpeks.la
 include/nessus/getopt.h
 include/nessus/harglists.h
-include/nessus/includes.h
 include/nessus/pcap.h
 include/nessus/pcap-namedb.h
 include/nessus/libnessus.h
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 57baccb9e582..e2c415e75d82 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	0.99.7
+PORTVERSION=	1.0.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
 
 MAINTAINER=	anders@fix.no
 
diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 03ecaedfcea9..2a84bd708a43 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-0.99.7.tar.gz) = 11fdeaae5b1c705b6222523c9540ae11
+MD5 (nessus/nessus-libraries-1.0.4.tar.gz) = 1fe60e282532c6018ed402a275903c15
diff --git a/security/nessus-libraries/pkg-plist b/security/nessus-libraries/pkg-plist
index de4f8b06ea68..ce2d1242548c 100644
--- a/security/nessus-libraries/pkg-plist
+++ b/security/nessus-libraries/pkg-plist
@@ -1,19 +1,18 @@
 lib/libhosts_gatherer.a
 lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.99
+lib/libhosts_gatherer.so.1
 lib/libnessus.a
 lib/libnessus.so
-lib/libnessus.so.99
+lib/libnessus.so.1
 lib/libpcap-nessus.a
 lib/libpcap-nessus.so
-lib/libpcap-nessus.so.99
+lib/libpcap-nessus.so.1
 lib/libpeks.a
 lib/libpeks.so
-lib/libpeks.so.0
-lib/libpeksmp.a
+lib/libpeks.so.8
+lib/libpeks.la
 include/nessus/getopt.h
 include/nessus/harglists.h
-include/nessus/includes.h
 include/nessus/pcap.h
 include/nessus/pcap-namedb.h
 include/nessus/libnessus.h
diff --git a/security/nessus-plugins-devel/Makefile b/security/nessus-plugins-devel/Makefile
index 6a21960c622b..d0abcd48a739 100644
--- a/security/nessus-plugins-devel/Makefile
+++ b/security/nessus-plugins-devel/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	0.99.7
+PORTVERSION=	1.0.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
 
 MAINTAINER=	anders@fix.no
 
@@ -32,5 +32,6 @@ WRKSRC=		${WRKDIR}/nessus-plugins
 GNU_CONFIGURE=	yes
 
 MAN1=		nessus-build.1
+MAN8=		nessus-update-plugins.8
 
 .include <bsd.port.mk>
diff --git a/security/nessus-plugins-devel/distinfo b/security/nessus-plugins-devel/distinfo
index 325d6c12a17b..4eaee43c2803 100644
--- a/security/nessus-plugins-devel/distinfo
+++ b/security/nessus-plugins-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-0.99.7.tar.gz) = 3e7d5da7083d10552b061ae0f0f763a2
+MD5 (nessus/nessus-plugins-1.0.4.tar.gz) = dc6a2758761428f3bf66d0a06806d66a
diff --git a/security/nessus-plugins-devel/pkg-plist b/security/nessus-plugins-devel/pkg-plist
index 008970f35371..b78031f67174 100644
--- a/security/nessus-plugins-devel/pkg-plist
+++ b/security/nessus-plugins-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/nessus-build
+sbin/nessus-update-plugins
 etc/nessus/accounts.txt
 etc/nessus/queso.conf
 lib/nessus/plugins/ColdFusion.nasl
@@ -7,36 +8,57 @@ lib/nessus/plugins/ExAir_dos_query.nasl
 lib/nessus/plugins/ExAir_dos_search.nasl
 lib/nessus/plugins/NetSphere.nasl
 lib/nessus/plugins/PC_anywhere.nasl
+lib/nessus/plugins/PGPCert_DoS.nasl
 lib/nessus/plugins/ShowCode.nasl
+lib/nessus/plugins/TelSrv_DoS.nasl
 lib/nessus/plugins/WebSite.nasl
+lib/nessus/plugins/X.nasl
+lib/nessus/plugins/acc.nasl
 lib/nessus/plugins/accounts.nes
+lib/nessus/plugins/afs_version.nasl
 lib/nessus/plugins/aix_ftpd.nasl
 lib/nessus/plugins/alibaba.nasl
 lib/nessus/plugins/alibaba_get32.nasl
 lib/nessus/plugins/alibaba_overflow.nasl
 lib/nessus/plugins/alibaba_pl.nasl
 lib/nessus/plugins/alibaba_tst.nasl
+lib/nessus/plugins/altavista_search.nasl
+lib/nessus/plugins/amanda_detect.nasl
 lib/nessus/plugins/an_httpd_cgis.nasl
+lib/nessus/plugins/analogx.nasl
+lib/nessus/plugins/analogx_dos.nasl
 lib/nessus/plugins/annex_dos.nasl
+lib/nessus/plugins/apache_slash.nasl
+lib/nessus/plugins/apache_source_asp.nasl
 lib/nessus/plugins/arkeia.nasl
 lib/nessus/plugins/ascend_kill.nasl
+lib/nessus/plugins/asp_source_data.nasl
+lib/nessus/plugins/asp_source_dot.nasl
 lib/nessus/plugins/ath0_hangup.nasl
 lib/nessus/plugins/auth_enabled.nasl
 lib/nessus/plugins/axent_raptor_dos.nasl
+lib/nessus/plugins/axis.nasl
 lib/nessus/plugins/backorifice1.nasl
 lib/nessus/plugins/bb-hist.nasl
+lib/nessus/plugins/bb-hostsvc.nasl
 lib/nessus/plugins/bftelnet.nasl
 lib/nessus/plugins/bigconf.nasl
 lib/nessus/plugins/bind_bof.nes
 lib/nessus/plugins/bind_version.nasl
 lib/nessus/plugins/bind_vulnerable.nasl
+lib/nessus/plugins/bizdb1_search.nasl
 lib/nessus/plugins/bonk.nasl
 lib/nessus/plugins/bootparamd.nasl
+lib/nessus/plugins/c32.nasl
 lib/nessus/plugins/ca_unicenter_file_transfer_service.nasl
 lib/nessus/plugins/ca_unicenter_transport_service.nasl
 lib/nessus/plugins/cachemgr_cgi.nasl
 lib/nessus/plugins/campas.nasl
+lib/nessus/plugins/cassandra_nntp_dos.nasl
+lib/nessus/plugins/cdk.nasl
+lib/nessus/plugins/cern_httpd_path.nasl
 lib/nessus/plugins/cfinger_search.nasl
+lib/nessus/plugins/cgibin_browsable.nasl
 lib/nessus/plugins/cgitest.nasl
 lib/nessus/plugins/cgiwrap.nasl
 lib/nessus/plugins/chameleon_smtpd_overflow.nasl
@@ -44,22 +66,34 @@ lib/nessus/plugins/chargen.nasl
 lib/nessus/plugins/checkpoint.nasl
 lib/nessus/plugins/cisco_675.nasl
 lib/nessus/plugins/cisco_dos.nasl
+lib/nessus/plugins/cisco_http_dos.nasl
 lib/nessus/plugins/cmail_overflow.nasl
 lib/nessus/plugins/communigatepro_overflow.nasl
 lib/nessus/plugins/count_cgi.nasl
+lib/nessus/plugins/csm_helo.nasl
 lib/nessus/plugins/cvs_detect.nasl
+lib/nessus/plugins/cvsweb_shell.nasl
+lib/nessus/plugins/cvsweb_version.nasl
+lib/nessus/plugins/dansie_cart.nasl
 lib/nessus/plugins/daytime.nasl
+lib/nessus/plugins/dbman_cgi.nasl
 lib/nessus/plugins/deep_throat.nasl
 lib/nessus/plugins/delegate_overflow.nasl
 lib/nessus/plugins/dfire_cgi.nasl
+lib/nessus/plugins/dmail_overflow.nasl
+lib/nessus/plugins/doc_browsable.nasl
 lib/nessus/plugins/domino.nasl
 lib/nessus/plugins/domino_fs_config.nasl
 lib/nessus/plugins/domino_http_dos.nasl
+lib/nessus/plugins/dragon_ftp.nasl
+lib/nessus/plugins/dragon_telnet.nasl
 lib/nessus/plugins/dumpenv.nasl
 lib/nessus/plugins/echo.nasl
 lib/nessus/plugins/eicon_modem_dos.nasl
 lib/nessus/plugins/eserv.nasl
+lib/nessus/plugins/eviewer.nasl
 lib/nessus/plugins/ews.nasl
+lib/nessus/plugins/ezshopper.nasl
 lib/nessus/plugins/fakebo.nasl
 lib/nessus/plugins/faxsurvey.nasl
 lib/nessus/plugins/find_service.nes
@@ -72,8 +106,11 @@ lib/nessus/plugins/finger_redirection.nasl
 lib/nessus/plugins/firewall1_dos.nasl
 lib/nessus/plugins/formhandler.nasl
 lib/nessus/plugins/formmail_pl.nasl
+lib/nessus/plugins/fp_htimage.nasl
 lib/nessus/plugins/frontpage.nasl
 lib/nessus/plugins/frontpage_authors.nasl
+lib/nessus/plugins/frontpage_dvwssr.nasl
+lib/nessus/plugins/frontpage_shtml.nasl
 lib/nessus/plugins/ftp_anonymous.nasl
 lib/nessus/plugins/ftp_backdoor.nasl
 lib/nessus/plugins/ftp_bounce.nasl
@@ -83,6 +120,7 @@ lib/nessus/plugins/ftp_cwd_root.nasl
 lib/nessus/plugins/ftp_overflow.nasl
 lib/nessus/plugins/ftp_pasv_dos.nasl
 lib/nessus/plugins/ftp_pasv_on_connect.nasl
+lib/nessus/plugins/ftp_pl.nasl
 lib/nessus/plugins/ftp_realpath.nasl
 lib/nessus/plugins/ftp_root.nasl
 lib/nessus/plugins/ftp_servu_dos.nasl
@@ -91,50 +129,96 @@ lib/nessus/plugins/ftp_write_dirs.nes
 lib/nessus/plugins/ftpgate.nasl
 lib/nessus/plugins/ftpserver_detect_type_nd_version.nasl
 lib/nessus/plugins/gatecrasher.nasl
+lib/nessus/plugins/gauntlet_overflow.nasl
 lib/nessus/plugins/girlfriend.nasl
 lib/nessus/plugins/glimpse.nasl
+lib/nessus/plugins/gnapster_get_file.nasl
+lib/nessus/plugins/groupwise_overflow.nasl
 lib/nessus/plugins/guestbook.nasl
 lib/nessus/plugins/guestbook_pl.nasl
+lib/nessus/plugins/guild_ftp.nasl
 lib/nessus/plugins/handler.nasl
+lib/nessus/plugins/homefree.nasl
 lib/nessus/plugins/hotsync.nasl
 lib/nessus/plugins/hp_printer_display.nasl
 lib/nessus/plugins/hp_remote_print.nasl
+lib/nessus/plugins/htdig.nasl
 lib/nessus/plugins/htmlscript.nasl
+lib/nessus/plugins/htsearch_location.nasl
+lib/nessus/plugins/http_version.nasl
+lib/nessus/plugins/httpd_nobody.nasl
 lib/nessus/plugins/hyperbomb.nasl
 lib/nessus/plugins/i2odialogd.nasl
 lib/nessus/plugins/iChat.nasl
 lib/nessus/plugins/iParty.nasl
 lib/nessus/plugins/icat.nasl
+lib/nessus/plugins/icecap_default_pw.nasl
 lib/nessus/plugins/icmp_mask_req.nasl
 lib/nessus/plugins/icmp_timestamp.nasl
+lib/nessus/plugins/icq_crash.nasl
+lib/nessus/plugins/idq_dll.nasl
+lib/nessus/plugins/iis_authentification_manager.nasl
 lib/nessus/plugins/iis_buffer_overflow.nasl
 lib/nessus/plugins/iis_crash.nasl
+lib/nessus/plugins/iis_dos_ussrback.nasl
 lib/nessus/plugins/iis_ftp_crash.nasl
 lib/nessus/plugins/iis_malformed_request.nasl
 lib/nessus/plugins/iis_perl_problem.nasl
+lib/nessus/plugins/iis_repost_asp.nasl
+lib/nessus/plugins/iis_samples.nasl
 lib/nessus/plugins/iis_scripts.nasl
+lib/nessus/plugins/iisadmin.nasl
 lib/nessus/plugins/imagemap.nasl
 lib/nessus/plugins/imail_imapd_overflow.nasl
 lib/nessus/plugins/imail_imonitor_overflow.nasl
 lib/nessus/plugins/imap_overflow.nasl
+lib/nessus/plugins/imate_overflow.nasl
 lib/nessus/plugins/in_fingerd.nasl
 lib/nessus/plugins/info2www.nasl
+lib/nessus/plugins/infosrch.nasl
 lib/nessus/plugins/inn.nasl
+lib/nessus/plugins/innd_overflow.nasl
+lib/nessus/plugins/interscan_dos.nasl
 lib/nessus/plugins/ipop2d.nasl
+lib/nessus/plugins/ipop2d_readfiles.nasl
+lib/nessus/plugins/ithousemail_bof.nasl
 lib/nessus/plugins/jj.nasl
+lib/nessus/plugins/jrun.nasl
+lib/nessus/plugins/ken_segfault.nasl
+lib/nessus/plugins/kerberos_overflow.nasl
+lib/nessus/plugins/kuang2_the_virus.nasl
 lib/nessus/plugins/land.nasl
+lib/nessus/plugins/lcdproc_buffer_overflow.nasl
+lib/nessus/plugins/lcdproc_detect.nasl
 lib/nessus/plugins/linux_tftp.nes
 lib/nessus/plugins/linux_zero_len_fragment.nasl
+lib/nessus/plugins/linuxconf_detect.nasl
+lib/nessus/plugins/lotus_esmtp_overflow.nasl
+lib/nessus/plugins/mbdms_overflow.nasl
 lib/nessus/plugins/mdaemon.nasl
 lib/nessus/plugins/mdaemon_dos.nasl
 lib/nessus/plugins/mdaemon_webconfig.nasl
 lib/nessus/plugins/mdaemon_worldclient.nasl
 lib/nessus/plugins/mediahouse_statistics_server.nasl
+lib/nessus/plugins/mercure_imap_read_any_file.nasl
+lib/nessus/plugins/mercure_webview.nasl
 lib/nessus/plugins/metainfo_mail.nasl
+lib/nessus/plugins/minivend_view_page.nasl
+lib/nessus/plugins/mkilog.nasl
+lib/nessus/plugins/ms_index_server.nasl
+lib/nessus/plugins/msadcs_dll.nasl
 lib/nessus/plugins/mspws_dotdotdot.nasl
 lib/nessus/plugins/msql_overflow.nasl
 lib/nessus/plugins/mssqlserver_detect.nasl
 lib/nessus/plugins/mssqlserver_dos.nasl
+lib/nessus/plugins/mstream_agent.nasl
+lib/nessus/plugins/mstream_handler.nasl
+lib/nessus/plugins/multicsp_detect.nasl
+lib/nessus/plugins/mysql_bad_password.nasl
+lib/nessus/plugins/mysql_unpassworded.nasl
+lib/nessus/plugins/nai_webshield_info.nasl
+lib/nessus/plugins/nai_webshield_overflow.nasl
+lib/nessus/plugins/napster_detect.nasl
 lib/nessus/plugins/ncl_items.nasl
 lib/nessus/plugins/nessus_detect.nasl
 lib/nessus/plugins/nestea.nasl
@@ -144,22 +228,33 @@ lib/nessus/plugins/netbus.nasl
 lib/nessus/plugins/netbus2.nasl
 lib/nessus/plugins/netscape_PageServices.nasl
 lib/nessus/plugins/netscape_accept_overflow.nasl
+lib/nessus/plugins/netscape_adminpw.nasl
 lib/nessus/plugins/netscape_crash.nasl
 lib/nessus/plugins/netscape_fasttrack.nasl
+lib/nessus/plugins/netscape_publishing_expert_psuser.nasl
+lib/nessus/plugins/netscape_wp_tag.nasl
 lib/nessus/plugins/netstat.nasl
-lib/nessus/plugins/nfs_world_export.nes
+lib/nessus/plugins/newdsn.nasl
 lib/nessus/plugins/nis_server.nasl
 lib/nessus/plugins/nmap_tcp_connect.nes
 lib/nessus/plugins/nmap_wrapper.nes
 lib/nessus/plugins/nntpserver_detect.nasl
+lib/nessus/plugins/no404.nasl
+lib/nessus/plugins/nortel_cgiproc_dos.nasl
 lib/nessus/plugins/notes_mta_dos.nasl
+lib/nessus/plugins/novell_border_manager.nasl
 lib/nessus/plugins/nph-publish.nasl
 lib/nessus/plugins/nph-test-cgi.nasl
 lib/nessus/plugins/nt_ftp_guest.nasl
 lib/nessus/plugins/nt_spam.nasl
+lib/nessus/plugins/ntalk_detect.nasl
+lib/nessus/plugins/objectserver.nes
 lib/nessus/plugins/openlink_overflow.nasl
+lib/nessus/plugins/openssh_uselogin.nasl
 lib/nessus/plugins/oshare.nasl
+lib/nessus/plugins/ows_bin_cgi.nasl
 lib/nessus/plugins/ows_overflow.nasl
+lib/nessus/plugins/passwordless_cayman_router.nasl
 lib/nessus/plugins/passwordless_hp_printer.nasl
 lib/nessus/plugins/perl_cgi.nasl
 lib/nessus/plugins/pfdipaly.nasl
@@ -169,28 +264,45 @@ lib/nessus/plugins/php.nasl
 lib/nessus/plugins/php_overflow.nasl
 lib/nessus/plugins/pimp.nasl
 lib/nessus/plugins/ping_host.nasl
+lib/nessus/plugins/piranha.nasl
+lib/nessus/plugins/plusmail.nasl
 lib/nessus/plugins/pmcrash.nasl
 lib/nessus/plugins/pnserver.nasl
+lib/nessus/plugins/poc32.nasl
+lib/nessus/plugins/pollit.nasl
 lib/nessus/plugins/pop3_overflow.nasl
 lib/nessus/plugins/popserver_detect.nasl
 lib/nessus/plugins/portal_of_doom.nasl
+lib/nessus/plugins/postgresql_unpassworded.nasl
 lib/nessus/plugins/powerplay.nasl
+lib/nessus/plugins/printenv.nasl
 lib/nessus/plugins/proftpd_mkdir_overflow.nasl
 lib/nessus/plugins/proftpd_overflow.nasl
+lib/nessus/plugins/proftpd_pre10.nasl
 lib/nessus/plugins/proftpd_pre6_exploit.nasl
 lib/nessus/plugins/proxy_connect.nasl
 lib/nessus/plugins/proxy_port.nasl
 lib/nessus/plugins/proxy_post.nasl
 lib/nessus/plugins/proxy_use.nasl
 lib/nessus/plugins/qpopper.nasl
+lib/nessus/plugins/qpopper_euidl.nasl
+lib/nessus/plugins/qpopper_list.nasl
 lib/nessus/plugins/queso.nes
 lib/nessus/plugins/quote.nasl
+lib/nessus/plugins/ramcrash.nasl
+lib/nessus/plugins/realserver_malformed_request_dos.nasl
+lib/nessus/plugins/realserver_ussr_dos.nasl
 lib/nessus/plugins/realserverg2.nasl
 lib/nessus/plugins/relative_field_vulnerability.nasl
 lib/nessus/plugins/remwatch.nasl
 lib/nessus/plugins/rexecd.nasl
+lib/nessus/plugins/rfparalyze.nasl
 lib/nessus/plugins/rfpoison.nasl
 lib/nessus/plugins/rlogin.nasl
+lib/nessus/plugins/rockliffe_mailsite_overflow.nasl
+lib/nessus/plugins/rover_pop3_overflow.nasl
+lib/nessus/plugins/roxen_counter.nasl
+lib/nessus/plugins/roxen_percent.nasl
 lib/nessus/plugins/rpc_3270.nasl
 lib/nessus/plugins/rpc_X25.nasl
 lib/nessus/plugins/rpc_alis.nasl
@@ -199,6 +311,7 @@ lib/nessus/plugins/rpc_automountd.nasl
 lib/nessus/plugins/rpc_cmsd.nasl
 lib/nessus/plugins/rpc_database.nasl
 lib/nessus/plugins/rpc_etherstatd.nasl
+lib/nessus/plugins/rpc_fam.nasl
 lib/nessus/plugins/rpc_keyserv.nasl
 lib/nessus/plugins/rpc_llockmgr.nasl
 lib/nessus/plugins/rpc_nfsd.nasl
@@ -227,18 +340,54 @@ lib/nessus/plugins/rpc_ypbind.nasl
 lib/nessus/plugins/rpc_yppasswd.nasl
 lib/nessus/plugins/rpc_ypupated.nasl
 lib/nessus/plugins/rpc_ypxfrd.nasl
+lib/nessus/plugins/rpm_query.nasl
 lib/nessus/plugins/rsh.nasl
+lib/nessus/plugins/rsh_users.nasl
+lib/nessus/plugins/sambar_cgi.nasl
+lib/nessus/plugins/sambar_mailit.nasl
+lib/nessus/plugins/sambar_sendmail.nasl
+lib/nessus/plugins/sambar_sysadmin.nasl
+lib/nessus/plugins/sawmill.nasl
+lib/nessus/plugins/sawmill_password.nasl
 lib/nessus/plugins/sendmail_debug.nasl
 lib/nessus/plugins/sendmail_decode.nasl
 lib/nessus/plugins/sendmail_expn.nasl
 lib/nessus/plugins/sendmail_redirection.nasl
-lib/nessus/plugins/sequence_number_vulnerability.nasl
+lib/nessus/plugins/shaft.nasl
 lib/nessus/plugins/shells.nasl
+lib/nessus/plugins/showmount.nasl
+lib/nessus/plugins/siteUserMod.nasl
 lib/nessus/plugins/slmail.nasl
 lib/nessus/plugins/slmail27.nasl
 lib/nessus/plugins/slmail_helo.nasl
 lib/nessus/plugins/smad.nes
 lib/nessus/plugins/smartserver_pop_overflow.nasl
+lib/nessus/plugins/smb_accessible_shares.nasl
+lib/nessus/plugins/smb_crash_winlogon.nasl
+lib/nessus/plugins/smb_dom2sid.nasl
+lib/nessus/plugins/smb_enum_services.nasl
+lib/nessus/plugins/smb_enum_shares.nasl
+lib/nessus/plugins/smb_lanman_browse_list.nasl
+lib/nessus/plugins/smb_login.nasl
+lib/nessus/plugins/smb_login_as_users.nasl
+lib/nessus/plugins/smb_nt_ms00-029.nasl
+lib/nessus/plugins/smb_nt_ms00-036.nasl
+lib/nessus/plugins/smb_nt_ms00-047.nasl
+lib/nessus/plugins/smb_reg_autologon.nasl
+lib/nessus/plugins/smb_reg_hklm.nasl
+lib/nessus/plugins/smb_reg_missing_winreg.nasl
+lib/nessus/plugins/smb_reg_pdc.nasl
+lib/nessus/plugins/smb_reg_run_permissions.nasl
+lib/nessus/plugins/smb_reg_schedule.nasl
+lib/nessus/plugins/smb_reg_service_pack.nasl
+lib/nessus/plugins/smb_reg_sfcdisable.nasl
+lib/nessus/plugins/smb_reg_trojan_paths.nasl
+lib/nessus/plugins/smb_reg_winlogon_permissions.nasl
+lib/nessus/plugins/smb_registry_access.nasl
+lib/nessus/plugins/smb_registry_full_access.nasl
+lib/nessus/plugins/smb_sid2user.nasl
+lib/nessus/plugins/smb_svc_alerter.nasl
+lib/nessus/plugins/smb_svc_messenger.nasl
 lib/nessus/plugins/smtp_bounce.nasl
 lib/nessus/plugins/smtp_file.nasl
 lib/nessus/plugins/smtp_helo.nasl
@@ -247,12 +396,22 @@ lib/nessus/plugins/smtp_relay.nasl
 lib/nessus/plugins/smtpserver_detect.nasl
 lib/nessus/plugins/snmp_default_communities.nasl
 lib/nessus/plugins/snmp_detect.nasl
+lib/nessus/plugins/snmp_dos.nasl
+lib/nessus/plugins/sojourn.nasl
+lib/nessus/plugins/spinclient.nasl
 lib/nessus/plugins/ssh_detect.nasl
 lib/nessus/plugins/ssh_insertion.nasl
+lib/nessus/plugins/ssh_kerberos.nasl
 lib/nessus/plugins/ssh_overflow.nasl
+lib/nessus/plugins/stacheldraht.nasl
+lib/nessus/plugins/stream.nasl
+lib/nessus/plugins/subseven.nasl
 lib/nessus/plugins/sunkill.nasl
+lib/nessus/plugins/swat_detect.nasl
+lib/nessus/plugins/sygate_remote_control.nasl
 lib/nessus/plugins/systat.nasl
 lib/nessus/plugins/tcp_chorusing.nasl
+lib/nessus/plugins/tcp_ping.nasl
 lib/nessus/plugins/tcp_syn_scan.nasl
 lib/nessus/plugins/teardrop.nasl
 lib/nessus/plugins/telnet.nasl
@@ -263,21 +422,41 @@ lib/nessus/plugins/tfs_smtp_overflow.nasl
 lib/nessus/plugins/tftp_grab_file.nes
 lib/nessus/plugins/thttpd_buffer_overflow.nasl
 lib/nessus/plugins/thttpd_bug.nasl
+lib/nessus/plugins/tomcat_admin.nasl
+lib/nessus/plugins/tomcat_snoop.nasl
 lib/nessus/plugins/traceroute.nasl
+lib/nessus/plugins/trinoo.nasl
+lib/nessus/plugins/unicast_dos.nasl
 lib/nessus/plugins/upload_cgi.nasl
 lib/nessus/plugins/uploader_exe.nasl
 lib/nessus/plugins/uw_imap_overflow.nasl
+lib/nessus/plugins/uw_imap_overflow_two.nasl
 lib/nessus/plugins/vftpd_overflow.nasl
 lib/nessus/plugins/view_source_cgi.nasl
 lib/nessus/plugins/visadmin.nasl
+lib/nessus/plugins/vnc.nasl
+lib/nessus/plugins/vpop_input_validation.nasl
+lib/nessus/plugins/vqServer_admin_detect.nasl
+lib/nessus/plugins/vqServer_web_traversal.nasl
+lib/nessus/plugins/w3msql_overflow.nasl
 lib/nessus/plugins/web_traversal.nasl
+lib/nessus/plugins/webactive_log.nasl
 lib/nessus/plugins/webcart.nasl
 lib/nessus/plugins/webdist.nasl
+lib/nessus/plugins/webfind.nasl
 lib/nessus/plugins/webgais.nasl
+lib/nessus/plugins/webplus.nasl
+lib/nessus/plugins/webplus_version.nasl
 lib/nessus/plugins/websendmail.nasl
 lib/nessus/plugins/webserver_robot.nasl
+lib/nessus/plugins/website_pro.nasl
+lib/nessus/plugins/websitepro_overflow.nasl
+lib/nessus/plugins/webspeed.nasl
 lib/nessus/plugins/wftp.nasl
+lib/nessus/plugins/wftp_dos.nasl
 lib/nessus/plugins/whois_raw.nasl
+lib/nessus/plugins/win_trinoo.nasl
+lib/nessus/plugins/windmail.nasl
 lib/nessus/plugins/windows_detect.nasl
 lib/nessus/plugins/wingate.nasl
 lib/nessus/plugins/wingate_denial.nasl
@@ -286,8 +465,10 @@ lib/nessus/plugins/winnt_dns_flood.nasl
 lib/nessus/plugins/winnt_pptp_dos.nasl
 lib/nessus/plugins/winnuke.nasl
 lib/nessus/plugins/wins_udp_flood.nasl
+lib/nessus/plugins/winsatan.nasl
 lib/nessus/plugins/wrap.nasl
 lib/nessus/plugins/wu_ftpd_overflow.nasl
+lib/nessus/plugins/wu_ftpd_site_exec.nasl
 lib/nessus/plugins/wu_ftpd_site_newer.nasl
 lib/nessus/plugins/www_too_long_url.nasl
 lib/nessus/plugins/wwwboardpwd.nasl
@@ -295,46 +476,13 @@ lib/nessus/plugins/xitami_overflow.nasl
 lib/nessus/plugins/xtramail_control.nasl
 lib/nessus/plugins/xtramail_helo.nasl
 lib/nessus/plugins/xtramail_pop_overflow.nasl
-lib/nessus/plugins/cgibin_browsable.nasl
-lib/nessus/plugins/csm_helo.nasl
-lib/nessus/plugins/doc_browsable.nasl
-lib/nessus/plugins/http_version.nasl
-lib/nessus/plugins/printenv.nasl
-lib/nessus/plugins/rover_pop3_overflow.nasl
-lib/nessus/plugins/roxen_counter.nasl
-lib/nessus/plugins/w3msql_overflow.nasl
-lib/nessus/plugins/winsatan.nasl
 lib/nessus/plugins/yahoo_dos.nasl
-lib/nessus/plugins/altavista_search.nasl
-lib/nessus/plugins/homefree.nasl
-lib/nessus/plugins/plusmail.nasl
-lib/nessus/plugins/ramcrash.nasl
-lib/nessus/plugins/website_pro.nasl
-lib/nessus/plugins/cdk.nasl
-lib/nessus/plugins/cern_httpd_path.nasl
-lib/nessus/plugins/ezshopper.nasl
-lib/nessus/plugins/groupwise_overflow.nasl
-lib/nessus/plugins/idq_dll.nasl
-lib/nessus/plugins/kuang2_the_virus.nasl
-lib/nessus/plugins/nortel_cgiproc_dos.nasl
-lib/nessus/plugins/novell_border_manager.nasl
-lib/nessus/plugins/qpopper_list.nasl
-lib/nessus/plugins/sambar_cgi.nasl
-lib/nessus/plugins/siteUserMod.nasl
-lib/nessus/plugins/snmp_dos.nasl
-lib/nessus/plugins/stacheldraht.nasl
-lib/nessus/plugins/stream.nasl
-lib/nessus/plugins/sygate_remote_control.nasl
-lib/nessus/plugins/tcp_ping.nasl
-lib/nessus/plugins/trinoo.nasl
-lib/nessus/plugins/unicast_dos.nasl
-lib/nessus/plugins/webspeed.nasl
-lib/nessus/plugins/win_trinoo.nasl
 lib/nessus/plugins/zeus.nasl
+lib/nessus/plugins/zope.nasl
 lib/nessus/plugins_factory/Makefile
 lib/nessus/plugins_factory/libtool
 lib/nessus/plugins_factory/nessus.tmpl
 @dirrm lib/nessus/plugins_factory
 @dirrm lib/nessus/plugins
+@dirrm lib/nessus/reports
 @dirrm lib/nessus
-@dirrm etc/nessus
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 6a21960c622b..d0abcd48a739 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	0.99.7
+PORTVERSION=	1.0.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
 
 MAINTAINER=	anders@fix.no
 
@@ -32,5 +32,6 @@ WRKSRC=		${WRKDIR}/nessus-plugins
 GNU_CONFIGURE=	yes
 
 MAN1=		nessus-build.1
+MAN8=		nessus-update-plugins.8
 
 .include <bsd.port.mk>
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index 325d6c12a17b..4eaee43c2803 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-plugins-0.99.7.tar.gz) = 3e7d5da7083d10552b061ae0f0f763a2
+MD5 (nessus/nessus-plugins-1.0.4.tar.gz) = dc6a2758761428f3bf66d0a06806d66a
diff --git a/security/nessus-plugins/pkg-plist b/security/nessus-plugins/pkg-plist
index 008970f35371..b78031f67174 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -1,4 +1,5 @@
 bin/nessus-build
+sbin/nessus-update-plugins
 etc/nessus/accounts.txt
 etc/nessus/queso.conf
 lib/nessus/plugins/ColdFusion.nasl
@@ -7,36 +8,57 @@ lib/nessus/plugins/ExAir_dos_query.nasl
 lib/nessus/plugins/ExAir_dos_search.nasl
 lib/nessus/plugins/NetSphere.nasl
 lib/nessus/plugins/PC_anywhere.nasl
+lib/nessus/plugins/PGPCert_DoS.nasl
 lib/nessus/plugins/ShowCode.nasl
+lib/nessus/plugins/TelSrv_DoS.nasl
 lib/nessus/plugins/WebSite.nasl
+lib/nessus/plugins/X.nasl
+lib/nessus/plugins/acc.nasl
 lib/nessus/plugins/accounts.nes
+lib/nessus/plugins/afs_version.nasl
 lib/nessus/plugins/aix_ftpd.nasl
 lib/nessus/plugins/alibaba.nasl
 lib/nessus/plugins/alibaba_get32.nasl
 lib/nessus/plugins/alibaba_overflow.nasl
 lib/nessus/plugins/alibaba_pl.nasl
 lib/nessus/plugins/alibaba_tst.nasl
+lib/nessus/plugins/altavista_search.nasl
+lib/nessus/plugins/amanda_detect.nasl
 lib/nessus/plugins/an_httpd_cgis.nasl
+lib/nessus/plugins/analogx.nasl
+lib/nessus/plugins/analogx_dos.nasl
 lib/nessus/plugins/annex_dos.nasl
+lib/nessus/plugins/apache_slash.nasl
+lib/nessus/plugins/apache_source_asp.nasl
 lib/nessus/plugins/arkeia.nasl
 lib/nessus/plugins/ascend_kill.nasl
+lib/nessus/plugins/asp_source_data.nasl
+lib/nessus/plugins/asp_source_dot.nasl
 lib/nessus/plugins/ath0_hangup.nasl
 lib/nessus/plugins/auth_enabled.nasl
 lib/nessus/plugins/axent_raptor_dos.nasl
+lib/nessus/plugins/axis.nasl
 lib/nessus/plugins/backorifice1.nasl
 lib/nessus/plugins/bb-hist.nasl
+lib/nessus/plugins/bb-hostsvc.nasl
 lib/nessus/plugins/bftelnet.nasl
 lib/nessus/plugins/bigconf.nasl
 lib/nessus/plugins/bind_bof.nes
 lib/nessus/plugins/bind_version.nasl
 lib/nessus/plugins/bind_vulnerable.nasl
+lib/nessus/plugins/bizdb1_search.nasl
 lib/nessus/plugins/bonk.nasl
 lib/nessus/plugins/bootparamd.nasl
+lib/nessus/plugins/c32.nasl
 lib/nessus/plugins/ca_unicenter_file_transfer_service.nasl
 lib/nessus/plugins/ca_unicenter_transport_service.nasl
 lib/nessus/plugins/cachemgr_cgi.nasl
 lib/nessus/plugins/campas.nasl
+lib/nessus/plugins/cassandra_nntp_dos.nasl
+lib/nessus/plugins/cdk.nasl
+lib/nessus/plugins/cern_httpd_path.nasl
 lib/nessus/plugins/cfinger_search.nasl
+lib/nessus/plugins/cgibin_browsable.nasl
 lib/nessus/plugins/cgitest.nasl
 lib/nessus/plugins/cgiwrap.nasl
 lib/nessus/plugins/chameleon_smtpd_overflow.nasl
@@ -44,22 +66,34 @@ lib/nessus/plugins/chargen.nasl
 lib/nessus/plugins/checkpoint.nasl
 lib/nessus/plugins/cisco_675.nasl
 lib/nessus/plugins/cisco_dos.nasl
+lib/nessus/plugins/cisco_http_dos.nasl
 lib/nessus/plugins/cmail_overflow.nasl
 lib/nessus/plugins/communigatepro_overflow.nasl
 lib/nessus/plugins/count_cgi.nasl
+lib/nessus/plugins/csm_helo.nasl
 lib/nessus/plugins/cvs_detect.nasl
+lib/nessus/plugins/cvsweb_shell.nasl
+lib/nessus/plugins/cvsweb_version.nasl
+lib/nessus/plugins/dansie_cart.nasl
 lib/nessus/plugins/daytime.nasl
+lib/nessus/plugins/dbman_cgi.nasl
 lib/nessus/plugins/deep_throat.nasl
 lib/nessus/plugins/delegate_overflow.nasl
 lib/nessus/plugins/dfire_cgi.nasl
+lib/nessus/plugins/dmail_overflow.nasl
+lib/nessus/plugins/doc_browsable.nasl
 lib/nessus/plugins/domino.nasl
 lib/nessus/plugins/domino_fs_config.nasl
 lib/nessus/plugins/domino_http_dos.nasl
+lib/nessus/plugins/dragon_ftp.nasl
+lib/nessus/plugins/dragon_telnet.nasl
 lib/nessus/plugins/dumpenv.nasl
 lib/nessus/plugins/echo.nasl
 lib/nessus/plugins/eicon_modem_dos.nasl
 lib/nessus/plugins/eserv.nasl
+lib/nessus/plugins/eviewer.nasl
 lib/nessus/plugins/ews.nasl
+lib/nessus/plugins/ezshopper.nasl
 lib/nessus/plugins/fakebo.nasl
 lib/nessus/plugins/faxsurvey.nasl
 lib/nessus/plugins/find_service.nes
@@ -72,8 +106,11 @@ lib/nessus/plugins/finger_redirection.nasl
 lib/nessus/plugins/firewall1_dos.nasl
 lib/nessus/plugins/formhandler.nasl
 lib/nessus/plugins/formmail_pl.nasl
+lib/nessus/plugins/fp_htimage.nasl
 lib/nessus/plugins/frontpage.nasl
 lib/nessus/plugins/frontpage_authors.nasl
+lib/nessus/plugins/frontpage_dvwssr.nasl
+lib/nessus/plugins/frontpage_shtml.nasl
 lib/nessus/plugins/ftp_anonymous.nasl
 lib/nessus/plugins/ftp_backdoor.nasl
 lib/nessus/plugins/ftp_bounce.nasl
@@ -83,6 +120,7 @@ lib/nessus/plugins/ftp_cwd_root.nasl
 lib/nessus/plugins/ftp_overflow.nasl
 lib/nessus/plugins/ftp_pasv_dos.nasl
 lib/nessus/plugins/ftp_pasv_on_connect.nasl
+lib/nessus/plugins/ftp_pl.nasl
 lib/nessus/plugins/ftp_realpath.nasl
 lib/nessus/plugins/ftp_root.nasl
 lib/nessus/plugins/ftp_servu_dos.nasl
@@ -91,50 +129,96 @@ lib/nessus/plugins/ftp_write_dirs.nes
 lib/nessus/plugins/ftpgate.nasl
 lib/nessus/plugins/ftpserver_detect_type_nd_version.nasl
 lib/nessus/plugins/gatecrasher.nasl
+lib/nessus/plugins/gauntlet_overflow.nasl
 lib/nessus/plugins/girlfriend.nasl
 lib/nessus/plugins/glimpse.nasl
+lib/nessus/plugins/gnapster_get_file.nasl
+lib/nessus/plugins/groupwise_overflow.nasl
 lib/nessus/plugins/guestbook.nasl
 lib/nessus/plugins/guestbook_pl.nasl
+lib/nessus/plugins/guild_ftp.nasl
 lib/nessus/plugins/handler.nasl
+lib/nessus/plugins/homefree.nasl
 lib/nessus/plugins/hotsync.nasl
 lib/nessus/plugins/hp_printer_display.nasl
 lib/nessus/plugins/hp_remote_print.nasl
+lib/nessus/plugins/htdig.nasl
 lib/nessus/plugins/htmlscript.nasl
+lib/nessus/plugins/htsearch_location.nasl
+lib/nessus/plugins/http_version.nasl
+lib/nessus/plugins/httpd_nobody.nasl
 lib/nessus/plugins/hyperbomb.nasl
 lib/nessus/plugins/i2odialogd.nasl
 lib/nessus/plugins/iChat.nasl
 lib/nessus/plugins/iParty.nasl
 lib/nessus/plugins/icat.nasl
+lib/nessus/plugins/icecap_default_pw.nasl
 lib/nessus/plugins/icmp_mask_req.nasl
 lib/nessus/plugins/icmp_timestamp.nasl
+lib/nessus/plugins/icq_crash.nasl
+lib/nessus/plugins/idq_dll.nasl
+lib/nessus/plugins/iis_authentification_manager.nasl
 lib/nessus/plugins/iis_buffer_overflow.nasl
 lib/nessus/plugins/iis_crash.nasl
+lib/nessus/plugins/iis_dos_ussrback.nasl
 lib/nessus/plugins/iis_ftp_crash.nasl
 lib/nessus/plugins/iis_malformed_request.nasl
 lib/nessus/plugins/iis_perl_problem.nasl
+lib/nessus/plugins/iis_repost_asp.nasl
+lib/nessus/plugins/iis_samples.nasl
 lib/nessus/plugins/iis_scripts.nasl
+lib/nessus/plugins/iisadmin.nasl
 lib/nessus/plugins/imagemap.nasl
 lib/nessus/plugins/imail_imapd_overflow.nasl
 lib/nessus/plugins/imail_imonitor_overflow.nasl
 lib/nessus/plugins/imap_overflow.nasl
+lib/nessus/plugins/imate_overflow.nasl
 lib/nessus/plugins/in_fingerd.nasl
 lib/nessus/plugins/info2www.nasl
+lib/nessus/plugins/infosrch.nasl
 lib/nessus/plugins/inn.nasl
+lib/nessus/plugins/innd_overflow.nasl
+lib/nessus/plugins/interscan_dos.nasl
 lib/nessus/plugins/ipop2d.nasl
+lib/nessus/plugins/ipop2d_readfiles.nasl
+lib/nessus/plugins/ithousemail_bof.nasl
 lib/nessus/plugins/jj.nasl
+lib/nessus/plugins/jrun.nasl
+lib/nessus/plugins/ken_segfault.nasl
+lib/nessus/plugins/kerberos_overflow.nasl
+lib/nessus/plugins/kuang2_the_virus.nasl
 lib/nessus/plugins/land.nasl
+lib/nessus/plugins/lcdproc_buffer_overflow.nasl
+lib/nessus/plugins/lcdproc_detect.nasl
 lib/nessus/plugins/linux_tftp.nes
 lib/nessus/plugins/linux_zero_len_fragment.nasl
+lib/nessus/plugins/linuxconf_detect.nasl
+lib/nessus/plugins/lotus_esmtp_overflow.nasl
+lib/nessus/plugins/mbdms_overflow.nasl
 lib/nessus/plugins/mdaemon.nasl
 lib/nessus/plugins/mdaemon_dos.nasl
 lib/nessus/plugins/mdaemon_webconfig.nasl
 lib/nessus/plugins/mdaemon_worldclient.nasl
 lib/nessus/plugins/mediahouse_statistics_server.nasl
+lib/nessus/plugins/mercure_imap_read_any_file.nasl
+lib/nessus/plugins/mercure_webview.nasl
 lib/nessus/plugins/metainfo_mail.nasl
+lib/nessus/plugins/minivend_view_page.nasl
+lib/nessus/plugins/mkilog.nasl
+lib/nessus/plugins/ms_index_server.nasl
+lib/nessus/plugins/msadcs_dll.nasl
 lib/nessus/plugins/mspws_dotdotdot.nasl
 lib/nessus/plugins/msql_overflow.nasl
 lib/nessus/plugins/mssqlserver_detect.nasl
 lib/nessus/plugins/mssqlserver_dos.nasl
+lib/nessus/plugins/mstream_agent.nasl
+lib/nessus/plugins/mstream_handler.nasl
+lib/nessus/plugins/multicsp_detect.nasl
+lib/nessus/plugins/mysql_bad_password.nasl
+lib/nessus/plugins/mysql_unpassworded.nasl
+lib/nessus/plugins/nai_webshield_info.nasl
+lib/nessus/plugins/nai_webshield_overflow.nasl
+lib/nessus/plugins/napster_detect.nasl
 lib/nessus/plugins/ncl_items.nasl
 lib/nessus/plugins/nessus_detect.nasl
 lib/nessus/plugins/nestea.nasl
@@ -144,22 +228,33 @@ lib/nessus/plugins/netbus.nasl
 lib/nessus/plugins/netbus2.nasl
 lib/nessus/plugins/netscape_PageServices.nasl
 lib/nessus/plugins/netscape_accept_overflow.nasl
+lib/nessus/plugins/netscape_adminpw.nasl
 lib/nessus/plugins/netscape_crash.nasl
 lib/nessus/plugins/netscape_fasttrack.nasl
+lib/nessus/plugins/netscape_publishing_expert_psuser.nasl
+lib/nessus/plugins/netscape_wp_tag.nasl
 lib/nessus/plugins/netstat.nasl
-lib/nessus/plugins/nfs_world_export.nes
+lib/nessus/plugins/newdsn.nasl
 lib/nessus/plugins/nis_server.nasl
 lib/nessus/plugins/nmap_tcp_connect.nes
 lib/nessus/plugins/nmap_wrapper.nes
 lib/nessus/plugins/nntpserver_detect.nasl
+lib/nessus/plugins/no404.nasl
+lib/nessus/plugins/nortel_cgiproc_dos.nasl
 lib/nessus/plugins/notes_mta_dos.nasl
+lib/nessus/plugins/novell_border_manager.nasl
 lib/nessus/plugins/nph-publish.nasl
 lib/nessus/plugins/nph-test-cgi.nasl
 lib/nessus/plugins/nt_ftp_guest.nasl
 lib/nessus/plugins/nt_spam.nasl
+lib/nessus/plugins/ntalk_detect.nasl
+lib/nessus/plugins/objectserver.nes
 lib/nessus/plugins/openlink_overflow.nasl
+lib/nessus/plugins/openssh_uselogin.nasl
 lib/nessus/plugins/oshare.nasl
+lib/nessus/plugins/ows_bin_cgi.nasl
 lib/nessus/plugins/ows_overflow.nasl
+lib/nessus/plugins/passwordless_cayman_router.nasl
 lib/nessus/plugins/passwordless_hp_printer.nasl
 lib/nessus/plugins/perl_cgi.nasl
 lib/nessus/plugins/pfdipaly.nasl
@@ -169,28 +264,45 @@ lib/nessus/plugins/php.nasl
 lib/nessus/plugins/php_overflow.nasl
 lib/nessus/plugins/pimp.nasl
 lib/nessus/plugins/ping_host.nasl
+lib/nessus/plugins/piranha.nasl
+lib/nessus/plugins/plusmail.nasl
 lib/nessus/plugins/pmcrash.nasl
 lib/nessus/plugins/pnserver.nasl
+lib/nessus/plugins/poc32.nasl
+lib/nessus/plugins/pollit.nasl
 lib/nessus/plugins/pop3_overflow.nasl
 lib/nessus/plugins/popserver_detect.nasl
 lib/nessus/plugins/portal_of_doom.nasl
+lib/nessus/plugins/postgresql_unpassworded.nasl
 lib/nessus/plugins/powerplay.nasl
+lib/nessus/plugins/printenv.nasl
 lib/nessus/plugins/proftpd_mkdir_overflow.nasl
 lib/nessus/plugins/proftpd_overflow.nasl
+lib/nessus/plugins/proftpd_pre10.nasl
 lib/nessus/plugins/proftpd_pre6_exploit.nasl
 lib/nessus/plugins/proxy_connect.nasl
 lib/nessus/plugins/proxy_port.nasl
 lib/nessus/plugins/proxy_post.nasl
 lib/nessus/plugins/proxy_use.nasl
 lib/nessus/plugins/qpopper.nasl
+lib/nessus/plugins/qpopper_euidl.nasl
+lib/nessus/plugins/qpopper_list.nasl
 lib/nessus/plugins/queso.nes
 lib/nessus/plugins/quote.nasl
+lib/nessus/plugins/ramcrash.nasl
+lib/nessus/plugins/realserver_malformed_request_dos.nasl
+lib/nessus/plugins/realserver_ussr_dos.nasl
 lib/nessus/plugins/realserverg2.nasl
 lib/nessus/plugins/relative_field_vulnerability.nasl
 lib/nessus/plugins/remwatch.nasl
 lib/nessus/plugins/rexecd.nasl
+lib/nessus/plugins/rfparalyze.nasl
 lib/nessus/plugins/rfpoison.nasl
 lib/nessus/plugins/rlogin.nasl
+lib/nessus/plugins/rockliffe_mailsite_overflow.nasl
+lib/nessus/plugins/rover_pop3_overflow.nasl
+lib/nessus/plugins/roxen_counter.nasl
+lib/nessus/plugins/roxen_percent.nasl
 lib/nessus/plugins/rpc_3270.nasl
 lib/nessus/plugins/rpc_X25.nasl
 lib/nessus/plugins/rpc_alis.nasl
@@ -199,6 +311,7 @@ lib/nessus/plugins/rpc_automountd.nasl
 lib/nessus/plugins/rpc_cmsd.nasl
 lib/nessus/plugins/rpc_database.nasl
 lib/nessus/plugins/rpc_etherstatd.nasl
+lib/nessus/plugins/rpc_fam.nasl
 lib/nessus/plugins/rpc_keyserv.nasl
 lib/nessus/plugins/rpc_llockmgr.nasl
 lib/nessus/plugins/rpc_nfsd.nasl
@@ -227,18 +340,54 @@ lib/nessus/plugins/rpc_ypbind.nasl
 lib/nessus/plugins/rpc_yppasswd.nasl
 lib/nessus/plugins/rpc_ypupated.nasl
 lib/nessus/plugins/rpc_ypxfrd.nasl
+lib/nessus/plugins/rpm_query.nasl
 lib/nessus/plugins/rsh.nasl
+lib/nessus/plugins/rsh_users.nasl
+lib/nessus/plugins/sambar_cgi.nasl
+lib/nessus/plugins/sambar_mailit.nasl
+lib/nessus/plugins/sambar_sendmail.nasl
+lib/nessus/plugins/sambar_sysadmin.nasl
+lib/nessus/plugins/sawmill.nasl
+lib/nessus/plugins/sawmill_password.nasl
 lib/nessus/plugins/sendmail_debug.nasl
 lib/nessus/plugins/sendmail_decode.nasl
 lib/nessus/plugins/sendmail_expn.nasl
 lib/nessus/plugins/sendmail_redirection.nasl
-lib/nessus/plugins/sequence_number_vulnerability.nasl
+lib/nessus/plugins/shaft.nasl
 lib/nessus/plugins/shells.nasl
+lib/nessus/plugins/showmount.nasl
+lib/nessus/plugins/siteUserMod.nasl
 lib/nessus/plugins/slmail.nasl
 lib/nessus/plugins/slmail27.nasl
 lib/nessus/plugins/slmail_helo.nasl
 lib/nessus/plugins/smad.nes
 lib/nessus/plugins/smartserver_pop_overflow.nasl
+lib/nessus/plugins/smb_accessible_shares.nasl
+lib/nessus/plugins/smb_crash_winlogon.nasl
+lib/nessus/plugins/smb_dom2sid.nasl
+lib/nessus/plugins/smb_enum_services.nasl
+lib/nessus/plugins/smb_enum_shares.nasl
+lib/nessus/plugins/smb_lanman_browse_list.nasl
+lib/nessus/plugins/smb_login.nasl
+lib/nessus/plugins/smb_login_as_users.nasl
+lib/nessus/plugins/smb_nt_ms00-029.nasl
+lib/nessus/plugins/smb_nt_ms00-036.nasl
+lib/nessus/plugins/smb_nt_ms00-047.nasl
+lib/nessus/plugins/smb_reg_autologon.nasl
+lib/nessus/plugins/smb_reg_hklm.nasl
+lib/nessus/plugins/smb_reg_missing_winreg.nasl
+lib/nessus/plugins/smb_reg_pdc.nasl
+lib/nessus/plugins/smb_reg_run_permissions.nasl
+lib/nessus/plugins/smb_reg_schedule.nasl
+lib/nessus/plugins/smb_reg_service_pack.nasl
+lib/nessus/plugins/smb_reg_sfcdisable.nasl
+lib/nessus/plugins/smb_reg_trojan_paths.nasl
+lib/nessus/plugins/smb_reg_winlogon_permissions.nasl
+lib/nessus/plugins/smb_registry_access.nasl
+lib/nessus/plugins/smb_registry_full_access.nasl
+lib/nessus/plugins/smb_sid2user.nasl
+lib/nessus/plugins/smb_svc_alerter.nasl
+lib/nessus/plugins/smb_svc_messenger.nasl
 lib/nessus/plugins/smtp_bounce.nasl
 lib/nessus/plugins/smtp_file.nasl
 lib/nessus/plugins/smtp_helo.nasl
@@ -247,12 +396,22 @@ lib/nessus/plugins/smtp_relay.nasl
 lib/nessus/plugins/smtpserver_detect.nasl
 lib/nessus/plugins/snmp_default_communities.nasl
 lib/nessus/plugins/snmp_detect.nasl
+lib/nessus/plugins/snmp_dos.nasl
+lib/nessus/plugins/sojourn.nasl
+lib/nessus/plugins/spinclient.nasl
 lib/nessus/plugins/ssh_detect.nasl
 lib/nessus/plugins/ssh_insertion.nasl
+lib/nessus/plugins/ssh_kerberos.nasl
 lib/nessus/plugins/ssh_overflow.nasl
+lib/nessus/plugins/stacheldraht.nasl
+lib/nessus/plugins/stream.nasl
+lib/nessus/plugins/subseven.nasl
 lib/nessus/plugins/sunkill.nasl
+lib/nessus/plugins/swat_detect.nasl
+lib/nessus/plugins/sygate_remote_control.nasl
 lib/nessus/plugins/systat.nasl
 lib/nessus/plugins/tcp_chorusing.nasl
+lib/nessus/plugins/tcp_ping.nasl
 lib/nessus/plugins/tcp_syn_scan.nasl
 lib/nessus/plugins/teardrop.nasl
 lib/nessus/plugins/telnet.nasl
@@ -263,21 +422,41 @@ lib/nessus/plugins/tfs_smtp_overflow.nasl
 lib/nessus/plugins/tftp_grab_file.nes
 lib/nessus/plugins/thttpd_buffer_overflow.nasl
 lib/nessus/plugins/thttpd_bug.nasl
+lib/nessus/plugins/tomcat_admin.nasl
+lib/nessus/plugins/tomcat_snoop.nasl
 lib/nessus/plugins/traceroute.nasl
+lib/nessus/plugins/trinoo.nasl
+lib/nessus/plugins/unicast_dos.nasl
 lib/nessus/plugins/upload_cgi.nasl
 lib/nessus/plugins/uploader_exe.nasl
 lib/nessus/plugins/uw_imap_overflow.nasl
+lib/nessus/plugins/uw_imap_overflow_two.nasl
 lib/nessus/plugins/vftpd_overflow.nasl
 lib/nessus/plugins/view_source_cgi.nasl
 lib/nessus/plugins/visadmin.nasl
+lib/nessus/plugins/vnc.nasl
+lib/nessus/plugins/vpop_input_validation.nasl
+lib/nessus/plugins/vqServer_admin_detect.nasl
+lib/nessus/plugins/vqServer_web_traversal.nasl
+lib/nessus/plugins/w3msql_overflow.nasl
 lib/nessus/plugins/web_traversal.nasl
+lib/nessus/plugins/webactive_log.nasl
 lib/nessus/plugins/webcart.nasl
 lib/nessus/plugins/webdist.nasl
+lib/nessus/plugins/webfind.nasl
 lib/nessus/plugins/webgais.nasl
+lib/nessus/plugins/webplus.nasl
+lib/nessus/plugins/webplus_version.nasl
 lib/nessus/plugins/websendmail.nasl
 lib/nessus/plugins/webserver_robot.nasl
+lib/nessus/plugins/website_pro.nasl
+lib/nessus/plugins/websitepro_overflow.nasl
+lib/nessus/plugins/webspeed.nasl
 lib/nessus/plugins/wftp.nasl
+lib/nessus/plugins/wftp_dos.nasl
 lib/nessus/plugins/whois_raw.nasl
+lib/nessus/plugins/win_trinoo.nasl
+lib/nessus/plugins/windmail.nasl
 lib/nessus/plugins/windows_detect.nasl
 lib/nessus/plugins/wingate.nasl
 lib/nessus/plugins/wingate_denial.nasl
@@ -286,8 +465,10 @@ lib/nessus/plugins/winnt_dns_flood.nasl
 lib/nessus/plugins/winnt_pptp_dos.nasl
 lib/nessus/plugins/winnuke.nasl
 lib/nessus/plugins/wins_udp_flood.nasl
+lib/nessus/plugins/winsatan.nasl
 lib/nessus/plugins/wrap.nasl
 lib/nessus/plugins/wu_ftpd_overflow.nasl
+lib/nessus/plugins/wu_ftpd_site_exec.nasl
 lib/nessus/plugins/wu_ftpd_site_newer.nasl
 lib/nessus/plugins/www_too_long_url.nasl
 lib/nessus/plugins/wwwboardpwd.nasl
@@ -295,46 +476,13 @@ lib/nessus/plugins/xitami_overflow.nasl
 lib/nessus/plugins/xtramail_control.nasl
 lib/nessus/plugins/xtramail_helo.nasl
 lib/nessus/plugins/xtramail_pop_overflow.nasl
-lib/nessus/plugins/cgibin_browsable.nasl
-lib/nessus/plugins/csm_helo.nasl
-lib/nessus/plugins/doc_browsable.nasl
-lib/nessus/plugins/http_version.nasl
-lib/nessus/plugins/printenv.nasl
-lib/nessus/plugins/rover_pop3_overflow.nasl
-lib/nessus/plugins/roxen_counter.nasl
-lib/nessus/plugins/w3msql_overflow.nasl
-lib/nessus/plugins/winsatan.nasl
 lib/nessus/plugins/yahoo_dos.nasl
-lib/nessus/plugins/altavista_search.nasl
-lib/nessus/plugins/homefree.nasl
-lib/nessus/plugins/plusmail.nasl
-lib/nessus/plugins/ramcrash.nasl
-lib/nessus/plugins/website_pro.nasl
-lib/nessus/plugins/cdk.nasl
-lib/nessus/plugins/cern_httpd_path.nasl
-lib/nessus/plugins/ezshopper.nasl
-lib/nessus/plugins/groupwise_overflow.nasl
-lib/nessus/plugins/idq_dll.nasl
-lib/nessus/plugins/kuang2_the_virus.nasl
-lib/nessus/plugins/nortel_cgiproc_dos.nasl
-lib/nessus/plugins/novell_border_manager.nasl
-lib/nessus/plugins/qpopper_list.nasl
-lib/nessus/plugins/sambar_cgi.nasl
-lib/nessus/plugins/siteUserMod.nasl
-lib/nessus/plugins/snmp_dos.nasl
-lib/nessus/plugins/stacheldraht.nasl
-lib/nessus/plugins/stream.nasl
-lib/nessus/plugins/sygate_remote_control.nasl
-lib/nessus/plugins/tcp_ping.nasl
-lib/nessus/plugins/trinoo.nasl
-lib/nessus/plugins/unicast_dos.nasl
-lib/nessus/plugins/webspeed.nasl
-lib/nessus/plugins/win_trinoo.nasl
 lib/nessus/plugins/zeus.nasl
+lib/nessus/plugins/zope.nasl
 lib/nessus/plugins_factory/Makefile
 lib/nessus/plugins_factory/libtool
 lib/nessus/plugins_factory/nessus.tmpl
 @dirrm lib/nessus/plugins_factory
 @dirrm lib/nessus/plugins
+@dirrm lib/nessus/reports
 @dirrm lib/nessus
-@dirrm etc/nessus
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 245013226e5f..72d5a29fd058 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	nessus
-PORTVERSION=	0.99.7
+PORTVERSION=	1.0.4
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
-DISTNAME=	nessus-core-0.99.7
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/src/
+DISTNAME=	nessus-core-1.0.4
 
 MAINTAINER=	anders@fix.no
 
-LIB_DEPENDS=	nasl.99:${PORTSDIR}/security/nessus-libnasl \
+LIB_DEPENDS=	nasl.1:${PORTSDIR}/security/nessus-libnasl \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 NESSUS_REV=	${DISTNAME:S/nessus-core-//g}
@@ -33,7 +33,7 @@ WRKSRC=		${WRKDIR}/nessus-core
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GTKCONFIG="${GTK_CONFIG}"
 MAN1=		nessus.1
-MAN8=		nessusd.8
+MAN8=		nessusd.8 nessus-adduser.8
 
 post-install:
 		@${ECHO} "=========================================================="
diff --git a/security/nessus/distinfo b/security/nessus/distinfo
index 0afeb930012f..26db817bee21 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-core-0.99.7.tar.gz) = 45001a660027713b4d8d2493cbcac80d
+MD5 (nessus/nessus-core-1.0.4.tar.gz) = b6d66f613b3c45526195df9e0087dd63
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index f4f54a312a43..24f36bda5e19 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -1,4 +1,5 @@
 bin/nessus
+sbin/nessus-adduser
 include/nessus/config.h
 include/nessus/includes.h
 include/nessus/nessus-devel.h
@@ -11,6 +12,3 @@ include/nessus/ntcompat.h
 sbin/nessusd
 @dirrm var/nessus
 @dirrm etc/nessus
-@dirrm lib/nessus/plugins
-@dirrm lib/nessus/reports
-@dirrm lib/nessus