diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 38c17954d0ae..55c772e8bd15 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-libnasl
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.2a
 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-libnasl/distinfo b/security/nessus-libnasl/distinfo
index 84d5bd6312fe..e47095f72d7c 100644
--- a/security/nessus-libnasl/distinfo
+++ b/security/nessus-libnasl/distinfo
@@ -1,2 +1,2 @@
-MD5 (nessus/libnasl-2.2.0.tar.gz) = e0c248b1a49f2d1d3ee6dafd6db44d16
-SIZE (nessus/libnasl-2.2.0.tar.gz) = 366083
+MD5 (nessus/libnasl-2.2.2a.tar.gz) = 1ef731dd1470b9c4976071bad2fdfac6
+SIZE (nessus/libnasl-2.2.2a.tar.gz) = 366669
diff --git a/security/nessus-libnasl/pkg-plist b/security/nessus-libnasl/pkg-plist
index ff8dfaa2c8f8..72a6abb1878f 100644
--- a/security/nessus-libnasl/pkg-plist
+++ b/security/nessus-libnasl/pkg-plist
@@ -6,3 +6,5 @@ lib/libnasl.la
 lib/libnasl.so
 lib/libnasl.so.4
 var/nessus/nessus_org.pem
+@unexec rmdir %D/var/nessus 2>/dev/null || true
+@unexec rmdir %D/var 2>/dev/null || true
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index bc259b5fa08e..8eb105e60fa1 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -9,7 +9,7 @@
 # client.
 
 PORTNAME=	nessus-libraries
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.2a
 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-libraries/distinfo b/security/nessus-libraries/distinfo
index 5ef2007eb6bf..f0369aa135bf 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1,2 +1,2 @@
-MD5 (nessus/nessus-libraries-2.2.0.tar.gz) = 3bda0f8d412493883d046d9ab605f1d2
-SIZE (nessus/nessus-libraries-2.2.0.tar.gz) = 423869
+MD5 (nessus/nessus-libraries-2.2.2a.tar.gz) = b1f0fb61aa9dfd6f7189a84dc9007d34
+SIZE (nessus/nessus-libraries-2.2.2a.tar.gz) = 423965
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index e2becf18feb7..efc510c3b8fd 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nessus-plugins
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.2a
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -23,8 +23,7 @@ CONFLICTS=	nessus-plugins-devel-[0-9]*
 
 BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus
 RUN_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \
-		nmap:${PORTSDIR}/security/nmap \
-		wget:${PORTSDIR}/ftp/wget
+		nmap:${PORTSDIR}/security/nmap
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-plugins
diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo
index 53caf79c609b..fd1700ff9fd9 100644
--- a/security/nessus-plugins/distinfo
+++ b/security/nessus-plugins/distinfo
@@ -1,2 +1,2 @@
-MD5 (nessus/nessus-plugins-2.2.0.tar.gz) = c159ad4707770909f520b667372330f6
-SIZE (nessus/nessus-plugins-2.2.0.tar.gz) = 2541121
+MD5 (nessus/nessus-plugins-2.2.2a.tar.gz) = 19881413bd26f08f1d960a0076353e6e
+SIZE (nessus/nessus-plugins-2.2.2a.tar.gz) = 2758380
diff --git a/security/nessus-plugins/pkg-plist b/security/nessus-plugins/pkg-plist
index 1440c7ed94a2..8e231a4ec358 100644
--- a/security/nessus-plugins/pkg-plist
+++ b/security/nessus-plugins/pkg-plist
@@ -1,4 +1,5 @@
 bin/nessus-build
+lib/nessus/plugins/04webserver.nasl
 lib/nessus/plugins/12planet_chat_server_path_disclosure.nasl
 lib/nessus/plugins/12planet_chat_server_plaintext_password.nasl
 lib/nessus/plugins/12planet_chat_server_xss.nasl
@@ -58,6 +59,8 @@ lib/nessus/plugins/CSCea77143.nasl
 lib/nessus/plugins/CSCec16481.nasl
 lib/nessus/plugins/CSCec42751.nasl
 lib/nessus/plugins/CSCed30113.nasl
+lib/nessus/plugins/CSCee50294.nasl
+lib/nessus/plugins/CSCef46191.nasl
 lib/nessus/plugins/ColdFusion.nasl
 lib/nessus/plugins/ColdFusion_path_disclosure.nasl
 lib/nessus/plugins/CuteNews_code_injection.nasl
@@ -139,6 +142,7 @@ lib/nessus/plugins/Xeneo_Web_Server_2.2.9.0_DoS.nasl
 lib/nessus/plugins/Xerver_DoS.nasl
 lib/nessus/plugins/a1stats.nasl
 lib/nessus/plugins/aardvark_topsites_multiple.nasl
+lib/nessus/plugins/ability_ftp_overflow.nasl
 lib/nessus/plugins/aborior_cmd_exec.nasl
 lib/nessus/plugins/abyss_dos.nasl
 lib/nessus/plugins/abyss_msdos_dos.nasl
@@ -149,6 +153,7 @@ lib/nessus/plugins/account_EZsetup.nasl
 lib/nessus/plugins/account_OutOfBox.nasl
 lib/nessus/plugins/account_StoogR.nasl
 lib/nessus/plugins/account_backdoor.nasl
+lib/nessus/plugins/account_bash.nasl
 lib/nessus/plugins/account_date.nasl
 lib/nessus/plugins/account_db2as_db2as.nasl
 lib/nessus/plugins/account_db2as_ibmdb2.nasl
@@ -258,6 +263,7 @@ lib/nessus/plugins/aix_IY55681.nasl
 lib/nessus/plugins/aix_IY55682.nasl
 lib/nessus/plugins/aix_IY55789.nasl
 lib/nessus/plugins/aix_IY55790.nasl
+lib/nessus/plugins/aix_IY58143.nasl
 lib/nessus/plugins/aix_ftpd.nasl
 lib/nessus/plugins/aix_maintenance_level.nasl
 lib/nessus/plugins/album_pl_cmd_exec.nasl
@@ -282,6 +288,7 @@ lib/nessus/plugins/amap.nasl
 lib/nessus/plugins/an_httpd_cgis.nasl
 lib/nessus/plugins/an_httpd_count_cgi.nasl
 lib/nessus/plugins/anaconda.nasl
+lib/nessus/plugins/anaconda_doublenull.nasl
 lib/nessus/plugins/anacondaclip.nasl
 lib/nessus/plugins/analogx.nasl
 lib/nessus/plugins/analogx_dos.nasl
@@ -304,6 +311,7 @@ lib/nessus/plugins/apache_2_0_48.nasl
 lib/nessus/plugins/apache_2_0_49_mod_ssl.nasl
 lib/nessus/plugins/apache_2_0_51.nasl
 lib/nessus/plugins/apache_2_0_52.nasl
+lib/nessus/plugins/apache_SSL_complain.nasl
 lib/nessus/plugins/apache_Tomcat_DOS_Device_XSS.nasl
 lib/nessus/plugins/apache_Tomcat_Servlet_XSS.nasl
 lib/nessus/plugins/apache_Tomcat_TroubleShooter.nasl
@@ -315,6 +323,7 @@ lib/nessus/plugins/apache_conn_block.nasl
 lib/nessus/plugins/apache_dir_listing.nasl
 lib/nessus/plugins/apache_htpasswd_overflow.nasl
 lib/nessus/plugins/apache_input_header_folding_dos.nasl
+lib/nessus/plugins/apache_jakarta_xss.nasl
 lib/nessus/plugins/apache_log_injection.nasl
 lib/nessus/plugins/apache_mod_include_priv_escalation.nasl
 lib/nessus/plugins/apache_mod_proxy_buff_overflow.nasl
@@ -336,6 +345,7 @@ lib/nessus/plugins/appsocket_DoS.nasl
 lib/nessus/plugins/aprox_portal_file_disclosure.nasl
 lib/nessus/plugins/arcserve_hidden_share.nasl
 lib/nessus/plugins/argosoft_dos.nasl
+lib/nessus/plugins/argosoft_ftp_shortcut.nasl
 lib/nessus/plugins/argosoft_multiple_flaws.nasl
 lib/nessus/plugins/argosoft_server_xcmd.nasl
 lib/nessus/plugins/args_bat.nasl
@@ -371,6 +381,7 @@ lib/nessus/plugins/axent_raptor_dos.nasl
 lib/nessus/plugins/axis.nasl
 lib/nessus/plugins/axis2400_webcams.nasl
 lib/nessus/plugins/axis_camera.nasl
+lib/nessus/plugins/aztek_xss.nasl
 lib/nessus/plugins/b2cafelog_command_injection.nasl
 lib/nessus/plugins/backorifice1.nasl
 lib/nessus/plugins/backport.inc
@@ -437,6 +448,8 @@ lib/nessus/plugins/blackice_version_checker.nasl
 lib/nessus/plugins/blackmoon_ftp_users_database.nasl
 lib/nessus/plugins/blackmoon_ftp_users_enum.nasl
 lib/nessus/plugins/blnews_code_injection.nasl
+lib/nessus/plugins/bnc_auth_bypass.nasl
+lib/nessus/plugins/bofra_detect.nasl
 lib/nessus/plugins/bonk.nasl
 lib/nessus/plugins/bonsai_flaws.nasl
 lib/nessus/plugins/bonzi_buddy.nasl
@@ -445,6 +458,7 @@ lib/nessus/plugins/bootparamd_get_nis_domain.nasl
 lib/nessus/plugins/boozt_admin_overflow.nasl
 lib/nessus/plugins/breakcal_xss.nasl
 lib/nessus/plugins/brilliant_digital_detection.nasl
+lib/nessus/plugins/brio_dir_traversal.nasl
 lib/nessus/plugins/broadboard_sql_injection.nasl
 lib/nessus/plugins/broadvision_path_disclosure.nasl
 lib/nessus/plugins/broker_ftp.nasl
@@ -477,8 +491,11 @@ lib/nessus/plugins/canon_print_by_smtp.nasl
 lib/nessus/plugins/carello.nasl
 lib/nessus/plugins/cart32_xss.nasl
 lib/nessus/plugins/cassandra_nntp_dos.nasl
+lib/nessus/plugins/caudium_malformed_uri_dos.nasl
 lib/nessus/plugins/cayman_any_username.nasl
 lib/nessus/plugins/cc_guestbook.nasl
+lib/nessus/plugins/ccproxy_detect.nasl
+lib/nessus/plugins/ccproxy_overflow.nasl
 lib/nessus/plugins/cdk.nasl
 lib/nessus/plugins/cerbere_proxy_dos.nasl
 lib/nessus/plugins/cern_httpd_path.nasl
@@ -493,6 +510,7 @@ lib/nessus/plugins/cfinger_format_bug.nasl
 lib/nessus/plugins/cfinger_search.nasl
 lib/nessus/plugins/cfinger_version.nasl
 lib/nessus/plugins/cfwebstore_sql_injection.nasl
+lib/nessus/plugins/cgi_rb.nasl
 lib/nessus/plugins/cgibin_browsable.nasl
 lib/nessus/plugins/cgibin_in_kb.nasl
 lib/nessus/plugins/cgicso_command_execution.nasl
@@ -509,6 +527,11 @@ lib/nessus/plugins/check_ports.nasl
 lib/nessus/plugins/checkpoint.nasl
 lib/nessus/plugins/checkpoint_format.nasl
 lib/nessus/plugins/checkpoint_open_web_admin.nasl
+lib/nessus/plugins/cherokee_0_4_17.nasl
+lib/nessus/plugins/cherokee_0_4_6.nasl
+lib/nessus/plugins/cherokee_0_4_7.nasl
+lib/nessus/plugins/cherokee_dir_traversal.nasl
+lib/nessus/plugins/cherokee_remote_cmd.nasl
 lib/nessus/plugins/chora_detect.nasl
 lib/nessus/plugins/chora_remote_code_execution.nasl
 lib/nessus/plugins/cifs445.nasl
@@ -539,6 +562,7 @@ lib/nessus/plugins/citrix_xss.nasl
 lib/nessus/plugins/cjoverkill_xss.nasl
 lib/nessus/plugins/clarkconnectd.nasl
 lib/nessus/plugins/cleartrust_xss.nasl
+lib/nessus/plugins/cmail_multiple.nasl
 lib/nessus/plugins/cmail_overflow.nasl
 lib/nessus/plugins/cobalt_cube_webmail_dir_trav.nasl
 lib/nessus/plugins/cobalt_overflow_cgi.nasl
@@ -581,8 +605,10 @@ lib/nessus/plugins/csm_helo.nasl
 lib/nessus/plugins/csnews.nasl
 lib/nessus/plugins/cubecart_sql_injection.nasl
 lib/nessus/plugins/cups_browseable_printers_list.nasl
+lib/nessus/plugins/cups_empty_udp_dos.nasl
 lib/nessus/plugins/cups_vulns.nasl
 lib/nessus/plugins/cuteftp_flaws.nasl
+lib/nessus/plugins/cuteftp_flaws2.nasl
 lib/nessus/plugins/cutenews_indexphp_xss.nasl
 lib/nessus/plugins/cutenews_phpinfo.nasl
 lib/nessus/plugins/cutenews_show_news_xss.nasl
@@ -600,6 +626,7 @@ lib/nessus/plugins/cvs_public_pserver.nasl
 lib/nessus/plugins/cvstrac_account_deletion.nasl
 lib/nessus/plugins/cvstrac_cgi_overflows.nasl
 lib/nessus/plugins/cvstrac_db_plaintext_pass.nasl
+lib/nessus/plugins/cvstrac_detect.nasl
 lib/nessus/plugins/cvstrac_filediff.nasl
 lib/nessus/plugins/cvstrac_history_overflow.nasl
 lib/nessus/plugins/cvstrac_invalid_ticket_dos.nasl
@@ -611,6 +638,7 @@ lib/nessus/plugins/cvsweb_shell.nasl
 lib/nessus/plugins/cvsweb_version.nasl
 lib/nessus/plugins/cwmail.nasl
 lib/nessus/plugins/cydoor_detection.nasl
+lib/nessus/plugins/cyrus_imap_multiple_overflow.nasl
 lib/nessus/plugins/cyrus_imap_prelogin_overflow.nasl
 lib/nessus/plugins/cyrus_imsp_overflow.nasl
 lib/nessus/plugins/dabber_worm.nasl
@@ -1179,6 +1207,59 @@ lib/nessus/plugins/debian_DSA-551.nasl
 lib/nessus/plugins/debian_DSA-552.nasl
 lib/nessus/plugins/debian_DSA-553.nasl
 lib/nessus/plugins/debian_DSA-554.nasl
+lib/nessus/plugins/debian_DSA-555.nasl
+lib/nessus/plugins/debian_DSA-556.nasl
+lib/nessus/plugins/debian_DSA-557.nasl
+lib/nessus/plugins/debian_DSA-558.nasl
+lib/nessus/plugins/debian_DSA-559.nasl
+lib/nessus/plugins/debian_DSA-560.nasl
+lib/nessus/plugins/debian_DSA-561.nasl
+lib/nessus/plugins/debian_DSA-562.nasl
+lib/nessus/plugins/debian_DSA-563.nasl
+lib/nessus/plugins/debian_DSA-564.nasl
+lib/nessus/plugins/debian_DSA-565.nasl
+lib/nessus/plugins/debian_DSA-566.nasl
+lib/nessus/plugins/debian_DSA-567.nasl
+lib/nessus/plugins/debian_DSA-568.nasl
+lib/nessus/plugins/debian_DSA-569.nasl
+lib/nessus/plugins/debian_DSA-570.nasl
+lib/nessus/plugins/debian_DSA-571.nasl
+lib/nessus/plugins/debian_DSA-572.nasl
+lib/nessus/plugins/debian_DSA-573.nasl
+lib/nessus/plugins/debian_DSA-574.nasl
+lib/nessus/plugins/debian_DSA-575.nasl
+lib/nessus/plugins/debian_DSA-576.nasl
+lib/nessus/plugins/debian_DSA-577.nasl
+lib/nessus/plugins/debian_DSA-578.nasl
+lib/nessus/plugins/debian_DSA-579.nasl
+lib/nessus/plugins/debian_DSA-580.nasl
+lib/nessus/plugins/debian_DSA-581.nasl
+lib/nessus/plugins/debian_DSA-582.nasl
+lib/nessus/plugins/debian_DSA-583.nasl
+lib/nessus/plugins/debian_DSA-584.nasl
+lib/nessus/plugins/debian_DSA-585.nasl
+lib/nessus/plugins/debian_DSA-586.nasl
+lib/nessus/plugins/debian_DSA-587.nasl
+lib/nessus/plugins/debian_DSA-588.nasl
+lib/nessus/plugins/debian_DSA-589.nasl
+lib/nessus/plugins/debian_DSA-590.nasl
+lib/nessus/plugins/debian_DSA-591.nasl
+lib/nessus/plugins/debian_DSA-592.nasl
+lib/nessus/plugins/debian_DSA-593.nasl
+lib/nessus/plugins/debian_DSA-594.nasl
+lib/nessus/plugins/debian_DSA-595.nasl
+lib/nessus/plugins/debian_DSA-596.nasl
+lib/nessus/plugins/debian_DSA-597.nasl
+lib/nessus/plugins/debian_DSA-598.nasl
+lib/nessus/plugins/debian_DSA-599.nasl
+lib/nessus/plugins/debian_DSA-600.nasl
+lib/nessus/plugins/debian_DSA-601.nasl
+lib/nessus/plugins/debian_DSA-602.nasl
+lib/nessus/plugins/debian_DSA-603.nasl
+lib/nessus/plugins/debian_DSA-604.nasl
+lib/nessus/plugins/debian_DSA-605.nasl
+lib/nessus/plugins/debian_DSA-606.nasl
+lib/nessus/plugins/debian_DSA-607.nasl
 lib/nessus/plugins/debian_package.inc
 lib/nessus/plugins/debian_sasl_default_pwd.nasl
 lib/nessus/plugins/deep_throat.nasl
@@ -1199,8 +1280,10 @@ lib/nessus/plugins/directorypro.nasl
 lib/nessus/plugins/distcc_detection.nasl
 lib/nessus/plugins/dlink_router_overflow.nasl
 lib/nessus/plugins/dmail_overflow.nasl
+lib/nessus/plugins/dms_pop3_overflow.nasl
 lib/nessus/plugins/dns_cache_sniffing.nasl
 lib/nessus/plugins/dns_fingerprint.nasl
+lib/nessus/plugins/dns_response_flood.nasl
 lib/nessus/plugins/dns_server.nasl
 lib/nessus/plugins/dns_xfer.nasl
 lib/nessus/plugins/doc_browsable.nasl
@@ -1252,6 +1335,8 @@ lib/nessus/plugins/eftp_directory_traversal.nasl
 lib/nessus/plugins/eftp_dos.nasl
 lib/nessus/plugins/eftp_root_disclosure.nasl
 lib/nessus/plugins/egp_detect.nasl
+lib/nessus/plugins/egroupware_detect.nasl
+lib/nessus/plugins/egroupware_unknown_vuln.nasl
 lib/nessus/plugins/egroupware_xss.nasl
 lib/nessus/plugins/eicon_modem_dos.nasl
 lib/nessus/plugins/eldapo_plaintext_passwords.nasl
@@ -1287,6 +1372,7 @@ lib/nessus/plugins/fake_identd.nasl
 lib/nessus/plugins/fakebo.nasl
 lib/nessus/plugins/faq_o_matic_xss.nasl
 lib/nessus/plugins/faqmanager.nasl
+lib/nessus/plugins/faststream_head_dos.nasl
 lib/nessus/plugins/faxsurvey.nasl
 lib/nessus/plugins/fcgi_echo.nasl
 lib/nessus/plugins/fedora_2003-002.nasl
@@ -1420,8 +1506,28 @@ lib/nessus/plugins/fedora_2004-330.nasl
 lib/nessus/plugins/fedora_2004-331.nasl
 lib/nessus/plugins/fedora_2004-332.nasl
 lib/nessus/plugins/fedora_2004-334.nasl
+lib/nessus/plugins/fedora_2004-337.nasl
 lib/nessus/plugins/fedora_2004-338.nasl
 lib/nessus/plugins/fedora_2004-348.nasl
+lib/nessus/plugins/fedora_2004-357.nasl
+lib/nessus/plugins/fedora_2004-358.nasl
+lib/nessus/plugins/fedora_2004-402.nasl
+lib/nessus/plugins/fedora_2004-403.nasl
+lib/nessus/plugins/fedora_2004-411.nasl
+lib/nessus/plugins/fedora_2004-412.nasl
+lib/nessus/plugins/fedora_2004-420.nasl
+lib/nessus/plugins/fedora_2004-421.nasl
+lib/nessus/plugins/fedora_2004-433.nasl
+lib/nessus/plugins/fedora_2004-434.nasl
+lib/nessus/plugins/fedora_2004-450.nasl
+lib/nessus/plugins/fedora_2004-451.nasl
+lib/nessus/plugins/fedora_2004-459.nasl
+lib/nessus/plugins/fedora_2004-460.nasl
+lib/nessus/plugins/fedora_2004-471.nasl
+lib/nessus/plugins/fedora_2004-472.nasl
+lib/nessus/plugins/fedora_2004-487.nasl
+lib/nessus/plugins/fedora_2004-489.nasl
+lib/nessus/plugins/fedora_2004-530.nasl
 lib/nessus/plugins/filemakerpro_server.nasl
 lib/nessus/plugins/find_ap.nasl
 lib/nessus/plugins/find_service.nes
@@ -1454,18 +1560,23 @@ lib/nessus/plugins/fp_htimage.nasl
 lib/nessus/plugins/fqdn.nasl
 lib/nessus/plugins/freebsd_DarwinStreamingServer_413g.nasl
 lib/nessus/plugins/freebsd_ImageMagick_6062.nasl
+lib/nessus/plugins/freebsd_ImageMagick_613.nasl
 lib/nessus/plugins/freebsd_a2ps_413b2.nasl
 lib/nessus/plugins/freebsd_acroread_509.nasl
 lib/nessus/plugins/freebsd_anubis_362_1.nasl
 lib/nessus/plugins/freebsd_apache+ssl_1329153.nasl
 lib/nessus/plugins/freebsd_apache+ssl_13312819.nasl
+lib/nessus/plugins/freebsd_apache2_2052_2.nasl
 lib/nessus/plugins/freebsd_apache_1331_6_mod_proxy.nasl
+lib/nessus/plugins/freebsd_apache_1333_mod_include.nasl
 lib/nessus/plugins/freebsd_apache_2048_3.nasl
 lib/nessus/plugins/freebsd_apache_2050_3.nasl
 lib/nessus/plugins/freebsd_apache_2050_3_mod_dav.nasl
 lib/nessus/plugins/freebsd_apache_2051.nasl
 lib/nessus/plugins/freebsd_bind8_neg_poison.nasl
 lib/nessus/plugins/freebsd_bmon_121_2.nasl
+lib/nessus/plugins/freebsd_bnc_289.nasl
+lib/nessus/plugins/freebsd_bogofilter_0928.nasl
 lib/nessus/plugins/freebsd_buffer_cache.nasl
 lib/nessus/plugins/freebsd_cabextract_11.nasl
 lib/nessus/plugins/freebsd_cacti_086.nasl
@@ -1489,7 +1600,9 @@ lib/nessus/plugins/freebsd_ethereal_0103.nasl
 lib/nessus/plugins/freebsd_ethereal_0104.nasl
 lib/nessus/plugins/freebsd_ethereal_0105.nasl
 lib/nessus/plugins/freebsd_exim_433_20_1.nasl
+lib/nessus/plugins/freebsd_ez_ipupdate_3011b8_2.nasl
 lib/nessus/plugins/freebsd_ezbounce_104_a_1.nasl
+lib/nessus/plugins/freebsd_fetch.nasl
 lib/nessus/plugins/freebsd_fetchmail_620.nasl
 lib/nessus/plugins/freebsd_fetchmail_625.nasl
 lib/nessus/plugins/freebsd_fidogate_449_3.nasl
@@ -1498,15 +1611,19 @@ lib/nessus/plugins/freebsd_fsp_28119.nasl
 lib/nessus/plugins/freebsd_gaim_076.nasl
 lib/nessus/plugins/freebsd_gaim_081.nasl
 lib/nessus/plugins/freebsd_gallery_1432.nasl
+lib/nessus/plugins/freebsd_gd_2029_1.nasl
 lib/nessus/plugins/freebsd_getmail_325.nasl
 lib/nessus/plugins/freebsd_gift_087.nasl
 lib/nessus/plugins/freebsd_gnats_311319.nasl
+lib/nessus/plugins/freebsd_gnats_40_2.nasl
 lib/nessus/plugins/freebsd_gnomevfs_262_1.nasl
 lib/nessus/plugins/freebsd_gnupg_123_4.nasl
 lib/nessus/plugins/freebsd_gnutls_1017.nasl
 lib/nessus/plugins/freebsd_h323_bugs.nasl
+lib/nessus/plugins/freebsd_hafiye_10_1.nasl
 lib/nessus/plugins/freebsd_heimdal_061.nasl
 lib/nessus/plugins/freebsd_heimdal_061_1.nasl
+lib/nessus/plugins/freebsd_horde_227.nasl
 lib/nessus/plugins/freebsd_hsftp_114.nasl
 lib/nessus/plugins/freebsd_icecast2_202_1.nasl
 lib/nessus/plugins/freebsd_icecast_1312.nasl
@@ -1520,6 +1637,7 @@ lib/nessus/plugins/freebsd_imwheel_100p12.nasl
 lib/nessus/plugins/freebsd_inn_241.nasl
 lib/nessus/plugins/freebsd_jail_route.nasl
 lib/nessus/plugins/freebsd_jailed_processes.nasl
+lib/nessus/plugins/freebsd_java_plugin.nasl
 lib/nessus/plugins/freebsd_jftpgw_0135.nasl
 lib/nessus/plugins/freebsd_kdelibs_3233.nasl
 lib/nessus/plugins/freebsd_kdepim_314_1.nasl
@@ -1535,6 +1653,7 @@ lib/nessus/plugins/freebsd_libpng_1257.nasl
 lib/nessus/plugins/freebsd_libtool_temp_file.nasl
 lib/nessus/plugins/freebsd_libxine_10r3_5.nasl
 lib/nessus/plugins/freebsd_libxine_10r5_2.nasl
+lib/nessus/plugins/freebsd_libxml_1817_3.nasl
 lib/nessus/plugins/freebsd_linux.nasl
 lib/nessus/plugins/freebsd_mail_notification_070.nasl
 lib/nessus/plugins/freebsd_mailman_21.nasl
@@ -1570,6 +1689,7 @@ lib/nessus/plugins/freebsd_oftpd_037.nasl
 lib/nessus/plugins/freebsd_openoffice_112_1.nasl
 lib/nessus/plugins/freebsd_openssl_changecipherspec.nasl
 lib/nessus/plugins/freebsd_outofseq_tcp_packets_dos.nasl
+lib/nessus/plugins/freebsd_p5_Archive_Zip_114.nasl
 lib/nessus/plugins/freebsd_p5_Mail_SpamAssassin_264.nasl
 lib/nessus/plugins/freebsd_package.inc
 lib/nessus/plugins/freebsd_pam_smb_199_3.nasl
@@ -1589,9 +1709,13 @@ lib/nessus/plugins/freebsd_pine_444.nasl
 lib/nessus/plugins/freebsd_pine_450.nasl
 lib/nessus/plugins/freebsd_pine_458.nasl
 lib/nessus/plugins/freebsd_popfile_021.nasl
+lib/nessus/plugins/freebsd_postgresql_contrib_726.nasl
 lib/nessus/plugins/freebsd_pound_16.nasl
 lib/nessus/plugins/freebsd_proftpd_1210_r1.nasl
 lib/nessus/plugins/freebsd_proftpd_128_1.nasl
+lib/nessus/plugins/freebsd_proxytunnel_123.nasl
+lib/nessus/plugins/freebsd_prozilla_136_3.nasl
+lib/nessus/plugins/freebsd_putty_056.nasl
 lib/nessus/plugins/freebsd_qpopper_253_1.nasl
 lib/nessus/plugins/freebsd_qt_333.nasl
 lib/nessus/plugins/freebsd_racoon_20040116a.nasl
@@ -1603,31 +1727,38 @@ lib/nessus/plugins/freebsd_rsync_257.nasl
 lib/nessus/plugins/freebsd_rsync_261.nasl
 lib/nessus/plugins/freebsd_rsync_262_2.nasl
 lib/nessus/plugins/freebsd_ruby_181.nasl
+lib/nessus/plugins/freebsd_ruby_182p3.nasl
 lib/nessus/plugins/freebsd_samba_301_2.nasl
 lib/nessus/plugins/freebsd_samba_304_4.nasl
 lib/nessus/plugins/freebsd_samba_307_1.nasl
+lib/nessus/plugins/freebsd_samba_308.nasl
 lib/nessus/plugins/freebsd_setiathome_308.nasl
 lib/nessus/plugins/freebsd_setsockopt_521_4.nasl
 lib/nessus/plugins/freebsd_sharutils_421_2.nasl
 lib/nessus/plugins/freebsd_shmat.nasl
+lib/nessus/plugins/freebsd_socat_1403.nasl
 lib/nessus/plugins/freebsd_sox_12174_1.nasl
 lib/nessus/plugins/freebsd_squid_255.nasl
 lib/nessus/plugins/freebsd_squid_255_9.nasl
 lib/nessus/plugins/freebsd_squid_257.nasl
+lib/nessus/plugins/freebsd_squirrelmail_143a_3.nasl
 lib/nessus/plugins/freebsd_ssltelnet_0131.nasl
 lib/nessus/plugins/freebsd_subversion_102_1.nasl
 lib/nessus/plugins/freebsd_subversion_108.nasl
 lib/nessus/plugins/freebsd_sudo_168.nasl
+lib/nessus/plugins/freebsd_sudo_1682.nasl
 lib/nessus/plugins/freebsd_syscons_bounds.nasl
 lib/nessus/plugins/freebsd_tcpdump_381_351.nasl
 lib/nessus/plugins/freebsd_tiff_361_2.nasl
 lib/nessus/plugins/freebsd_tnftpd_0810.nasl
 lib/nessus/plugins/freebsd_tor_0081.nasl
+lib/nessus/plugins/freebsd_twiki_20040902.nasl
 lib/nessus/plugins/freebsd_uri_vulns.nasl
 lib/nessus/plugins/freebsd_uudeview_0520.nasl
 lib/nessus/plugins/freebsd_webmin_1150_5.nasl
 lib/nessus/plugins/freebsd_wordpress_121.nasl
 lib/nessus/plugins/freebsd_wuftpd_262_3.nasl
+lib/nessus/plugins/freebsd_wzdftpd_043.nasl
 lib/nessus/plugins/freebsd_xboing_24_2.nasl
 lib/nessus/plugins/freebsd_xchat_208_2.nasl
 lib/nessus/plugins/freebsd_xerces_260.nasl
@@ -1651,6 +1782,7 @@ lib/nessus/plugins/frontpage_passwordless.nasl
 lib/nessus/plugins/frontpage_shtml.nasl
 lib/nessus/plugins/frontpage_shtml_overflow.nasl
 lib/nessus/plugins/frontpage_xss.nasl
+lib/nessus/plugins/fsecure_fsmsh_disclosure.nasl
 lib/nessus/plugins/fsecure_ssh_pass_pol_evasion.nasl
 lib/nessus/plugins/fsp_detection.nasl
 lib/nessus/plugins/fspd_directory_traversal.nasl
@@ -1698,6 +1830,7 @@ lib/nessus/plugins/ftpvoyager_overflow.nasl
 lib/nessus/plugins/fusetalk_forum_xss.nasl
 lib/nessus/plugins/fw1_udp_DoS.nasl
 lib/nessus/plugins/gallery_auth_bypass.nasl
+lib/nessus/plugins/gallery_html_injection.nasl
 lib/nessus/plugins/gallery_injection.nasl
 lib/nessus/plugins/gallery_injection2.nasl
 lib/nessus/plugins/gallery_injection3.nasl
@@ -1916,6 +2049,55 @@ lib/nessus/plugins/gentoo_GLSA-200410-23.nasl
 lib/nessus/plugins/gentoo_GLSA-200410-24.nasl
 lib/nessus/plugins/gentoo_GLSA-200410-25.nasl
 lib/nessus/plugins/gentoo_GLSA-200410-26.nasl
+lib/nessus/plugins/gentoo_GLSA-200410-27.nasl
+lib/nessus/plugins/gentoo_GLSA-200410-28.nasl
+lib/nessus/plugins/gentoo_GLSA-200410-29.nasl
+lib/nessus/plugins/gentoo_GLSA-200410-30.nasl
+lib/nessus/plugins/gentoo_GLSA-200410-31.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-01.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-02.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-03.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-04.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-05.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-06.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-07.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-08.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-09.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-10.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-11.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-12.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-13.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-14.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-15.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-16.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-17.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-18.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-19.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-20.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-21.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-22.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-23.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-24.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-25.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-26.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-27.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-28.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-29.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-30.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-31.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-32.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-33.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-34.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-35.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-36.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-37.nasl
+lib/nessus/plugins/gentoo_GLSA-200411-38.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-01.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-02.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-03.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-04.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-05.nasl
+lib/nessus/plugins/gentoo_GLSA-200412-06.nasl
 lib/nessus/plugins/girlfriend.nasl
 lib/nessus/plugins/glimpse.nasl
 lib/nessus/plugins/global_settings.inc
@@ -1926,6 +2108,7 @@ lib/nessus/plugins/gnu_cfserv.nasl
 lib/nessus/plugins/gnutella_detect.nasl
 lib/nessus/plugins/gnutella_export.nasl
 lib/nessus/plugins/goodtech_ftpd_dos.nasl
+lib/nessus/plugins/goollery_xss.nasl
 lib/nessus/plugins/goscript_command_exec.nasl
 lib/nessus/plugins/gosmart_message_board.nasl
 lib/nessus/plugins/groupwise_overflow.nasl
@@ -1937,6 +2120,7 @@ lib/nessus/plugins/guestbook_justice.nasl
 lib/nessus/plugins/guestbook_pl.nasl
 lib/nessus/plugins/guestbook_tr3_passwd.nasl
 lib/nessus/plugins/guild_ftp.nasl
+lib/nessus/plugins/guildftpd_site_cmd_overflow.nasl
 lib/nessus/plugins/gupta_sqlbase_overflows.nasl
 lib/nessus/plugins/h323_detection.nasl
 lib/nessus/plugins/hacker_defender.nasl
@@ -1948,7 +2132,10 @@ lib/nessus/plugins/healthd_detect.nasl
 lib/nessus/plugins/helix_dos.nasl
 lib/nessus/plugins/helix_overflow.nasl
 lib/nessus/plugins/hello_detect.nasl
+lib/nessus/plugins/hfs_fork_source.nasl
 lib/nessus/plugins/homefree.nasl
+lib/nessus/plugins/horde_detect.nasl
+lib/nessus/plugins/horde_help_xss.nasl
 lib/nessus/plugins/horde_test_disclosure.nasl
 lib/nessus/plugins/horde_turba_path_disclosure.nasl
 lib/nessus/plugins/hosting_controller.nasl
@@ -1966,6 +2153,7 @@ lib/nessus/plugins/hpux_ftpd_rest_conversion.nasl
 lib/nessus/plugins/hsweb_location.nasl
 lib/nessus/plugins/hsx.nasl
 lib/nessus/plugins/htdig.nasl
+lib/nessus/plugins/htdig_xss.nasl
 lib/nessus/plugins/htgrep.nasl
 lib/nessus/plugins/htmlscript.nasl
 lib/nessus/plugins/htsearch_config_switch.nasl
@@ -1973,12 +2161,15 @@ lib/nessus/plugins/htsearch_location.nasl
 lib/nessus/plugins/http-rpc-epmap.nasl
 lib/nessus/plugins/http_asn1_decoding.nasl
 lib/nessus/plugins/http_func.inc
+lib/nessus/plugins/http_header_name_format_string.nasl
+lib/nessus/plugins/http_header_value_format_string.nasl
 lib/nessus/plugins/http_ids_evasion.nasl
 lib/nessus/plugins/http_keepalive.inc
 lib/nessus/plugins/http_login.nasl
 lib/nessus/plugins/http_method_format_string.nasl
 lib/nessus/plugins/http_methods.nasl
 lib/nessus/plugins/http_trace.nasl
+lib/nessus/plugins/http_url_format_string.nasl
 lib/nessus/plugins/http_version.nasl
 lib/nessus/plugins/http_w98_devname_dos.nasl
 lib/nessus/plugins/http_webshopper.nasl
@@ -1986,8 +2177,33 @@ lib/nessus/plugins/http_webstore.nasl
 lib/nessus/plugins/httpd_boa.nasl
 lib/nessus/plugins/httpd_nobody.nasl
 lib/nessus/plugins/httpver.nasl
+lib/nessus/plugins/hummingbird_ftp_overflow.nasl
 lib/nessus/plugins/hydra.nes
+lib/nessus/plugins/hydra_cisco.nasl
+lib/nessus/plugins/hydra_cisco_enable.nasl
+lib/nessus/plugins/hydra_cvs.nasl
+lib/nessus/plugins/hydra_ftp.nasl
+lib/nessus/plugins/hydra_http.nasl
+lib/nessus/plugins/hydra_http_proxy.nasl
+lib/nessus/plugins/hydra_icq.nasl
+lib/nessus/plugins/hydra_imap.nasl
+lib/nessus/plugins/hydra_ldap.nasl
+lib/nessus/plugins/hydra_mssql.nasl
+lib/nessus/plugins/hydra_nntp.nasl
+lib/nessus/plugins/hydra_options.nasl
+lib/nessus/plugins/hydra_pcnfs.nasl
+lib/nessus/plugins/hydra_pop3.nasl
+lib/nessus/plugins/hydra_rexec.nasl
+lib/nessus/plugins/hydra_sapr3.nasl
+lib/nessus/plugins/hydra_smb.nasl
+lib/nessus/plugins/hydra_smtp_auth.nasl
+lib/nessus/plugins/hydra_snmp.nasl
+lib/nessus/plugins/hydra_socks5.nasl
+lib/nessus/plugins/hydra_ssh2.nasl
+lib/nessus/plugins/hydra_telnet.nasl
+lib/nessus/plugins/hydra_vnc.nasl
 lib/nessus/plugins/hyperbomb.nasl
+lib/nessus/plugins/i-mall_cgi.nasl
 lib/nessus/plugins/i2odialogd.nasl
 lib/nessus/plugins/iChat.nasl
 lib/nessus/plugins/iParty.nasl
@@ -2006,6 +2222,7 @@ lib/nessus/plugins/icecast_rbof.nasl
 lib/nessus/plugins/icecast_slash_dos.nasl
 lib/nessus/plugins/icecast_xss.nasl
 lib/nessus/plugins/icewarp_webmail_vulns.nasl
+lib/nessus/plugins/icewarp_webmail_vulns2.nasl
 lib/nessus/plugins/icmp_leak.nasl
 lib/nessus/plugins/icmp_mask_req.nasl
 lib/nessus/plugins/icmp_timestamp.nasl
@@ -2081,7 +2298,10 @@ lib/nessus/plugins/imap4_banner.nasl
 lib/nessus/plugins/imap4_rev1_overflow.nasl
 lib/nessus/plugins/imap_arbitrary_file_retrieval.nasl
 lib/nessus/plugins/imap_body_overflow.nasl
+lib/nessus/plugins/imap_func.inc
 lib/nessus/plugins/imap_overflow.nasl
+lib/nessus/plugins/imap_unencrypted_cleartext_logins.nasl
+lib/nessus/plugins/imapproxy_literal_dos.nasl
 lib/nessus/plugins/imate_overflow.nasl
 lib/nessus/plugins/imp_content_type_xss.nasl
 lib/nessus/plugins/imp_detect.nasl
@@ -2090,12 +2310,14 @@ lib/nessus/plugins/imp_html_plus_time_xss.nasl
 lib/nessus/plugins/imp_mime_viewer_html_xss.nasl
 lib/nessus/plugins/imp_session_hijacking.nasl
 lib/nessus/plugins/imp_sql_injection.nasl
+lib/nessus/plugins/imp_status_xss.nasl
 lib/nessus/plugins/in_fingerd.nasl
 lib/nessus/plugins/incomplete_http_requests_DoS.nasl
 lib/nessus/plugins/info2www.nasl
 lib/nessus/plugins/informix_traversal.nasl
 lib/nessus/plugins/infosrch.nasl
 lib/nessus/plugins/inktomi_path_disclosure.nasl
+lib/nessus/plugins/inmail_inshop_xss.nasl
 lib/nessus/plugins/inn.nasl
 lib/nessus/plugins/inn_buff_overflow.nasl
 lib/nessus/plugins/inn_control_message_overflow.nasl
@@ -2105,6 +2327,8 @@ lib/nessus/plugins/intellipeer_disclosure.nasl
 lib/nessus/plugins/interchange_detect.nasl
 lib/nessus/plugins/interscan_dos.nasl
 lib/nessus/plugins/interscan_vw_cgi.nasl
+lib/nessus/plugins/interspect_detect.nasl
+lib/nessus/plugins/intrushield_console_detect.nasl
 lib/nessus/plugins/invision_power_board.nasl
 lib/nessus/plugins/invision_power_board_calendar_sql_injection.nasl
 lib/nessus/plugins/invision_power_board_ssi_sql_injection.nasl
@@ -2113,6 +2337,8 @@ lib/nessus/plugins/invision_power_top_site_sql_injection.nasl
 lib/nessus/plugins/invision_pwb.nasl
 lib/nessus/plugins/ion_p.nasl
 lib/nessus/plugins/ip_protocol_scan.nasl
+lib/nessus/plugins/ipb_arcade_sql.nasl
+lib/nessus/plugins/ipb_post_sql.nasl
 lib/nessus/plugins/ipb_sql_disclosure.nasl
 lib/nessus/plugins/ipinsight_detection.nasl
 lib/nessus/plugins/iplanet_app_server_detection.nasl
@@ -2126,6 +2352,7 @@ lib/nessus/plugins/iplanet_traversal.nasl
 lib/nessus/plugins/ipop2d.nasl
 lib/nessus/plugins/ipop2d_readfiles.nasl
 lib/nessus/plugins/ipswitch_IMail_bo.nasl
+lib/nessus/plugins/ipswitch_IMail_bo2.nasl
 lib/nessus/plugins/ipswitch_IMail_version.nasl
 lib/nessus/plugins/ircd.nasl
 lib/nessus/plugins/ircd_dos.nasl
@@ -2141,7 +2368,10 @@ lib/nessus/plugins/ithousemail_bof.nasl
 lib/nessus/plugins/iws_shtml.nasl
 lib/nessus/plugins/ixmail_arbitrary_file_upload.nasl
 lib/nessus/plugins/ixmail_sql_injection.nasl
+lib/nessus/plugins/jana_server_dos.nasl
 lib/nessus/plugins/java_jre_jdk_dos.nasl
+lib/nessus/plugins/java_jre_plugin_security_bypass.nasl
+lib/nessus/plugins/java_jre_version_invocation.nasl
 lib/nessus/plugins/java_source_retrieval.nasl
 lib/nessus/plugins/jboss_source.nasl
 lib/nessus/plugins/jbrowser_multiple_vulns.nasl
@@ -2182,6 +2412,7 @@ lib/nessus/plugins/kietu_code_injection.nasl
 lib/nessus/plugins/knfs_dos.nasl
 lib/nessus/plugins/knowledge_builder_code_execution.nasl
 lib/nessus/plugins/korgo.nasl
+lib/nessus/plugins/korweblog_directory_listing.nasl
 lib/nessus/plugins/kpym_telnet_overflow.nasl
 lib/nessus/plugins/krb_pingpong.nasl
 lib/nessus/plugins/kuang2_the_virus.nasl
@@ -2246,22 +2477,28 @@ lib/nessus/plugins/macosx_SecUpd20040809.nasl
 lib/nessus/plugins/macosx_SecUpd20040907.nasl
 lib/nessus/plugins/macosx_SecUpd20040916.nasl
 lib/nessus/plugins/macosx_SecUpd20040930.nasl
+lib/nessus/plugins/macosx_SecUpd20041202.nasl
+lib/nessus/plugins/macosx_ical154.nasl
 lib/nessus/plugins/macosx_multiple_vulns.nasl
 lib/nessus/plugins/macosx_server_default_password.nasl
 lib/nessus/plugins/macosx_version.nasl
 lib/nessus/plugins/magic_winmail_pop_format_string.nasl
 lib/nessus/plugins/mail_asn1_decoding.nasl
+lib/nessus/plugins/mailcarrier_smtp_overflow.nasl
 lib/nessus/plugins/mailenable_httpmail_authorization_dos.nasl
 lib/nessus/plugins/mailenable_httpmail_content_length_overflow.nasl
 lib/nessus/plugins/mailenable_httpmail_get_overflow.nasl
+lib/nessus/plugins/mailenable_imap_overflows.nasl
 lib/nessus/plugins/mailenable_imap_search_dos.nasl
 lib/nessus/plugins/mailenable_smtp_dos.nasl
+lib/nessus/plugins/mailenable_unspecified_vuln.nasl
 lib/nessus/plugins/mailman_password_retrieval.nasl
 lib/nessus/plugins/mailman_webmail.nasl
 lib/nessus/plugins/mailmax_imap_overflows.nasl
 lib/nessus/plugins/mailmax_imap_overflows2.nasl
 lib/nessus/plugins/mailmaxweb_path_disclosure.nasl
 lib/nessus/plugins/mailnews.nasl
+lib/nessus/plugins/mailpost_multiple_flaws.nasl
 lib/nessus/plugins/mailreader.nasl
 lib/nessus/plugins/mailsweeper_archive_filtering.nasl
 lib/nessus/plugins/mailsweeper_ppt_dos.nasl
@@ -2627,10 +2864,42 @@ lib/nessus/plugins/mandrake_MDKSA-2004-113.nasl
 lib/nessus/plugins/mandrake_MDKSA-2004-114.nasl
 lib/nessus/plugins/mandrake_MDKSA-2004-115.nasl
 lib/nessus/plugins/mandrake_MDKSA-2004-116.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-117.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-118.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-119.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-120.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-121.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-122.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-123.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-124.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-125.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-126.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-127.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-128.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-129.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-130.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-131.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-132.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-133.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-134.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-135.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-136.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-137.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-138.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-139.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-140.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-141.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-142.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-143.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-144.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-145.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-146.nasl
+lib/nessus/plugins/mandrake_MDKSA-2004-147.nasl
 lib/nessus/plugins/manpage_file_disclosure.nasl
 lib/nessus/plugins/mantis_detect.nasl
 lib/nessus/plugins/mantis_multiple_vulns.nasl
 lib/nessus/plugins/mantis_multiple_vulns2.nasl
+lib/nessus/plugins/mantis_multiple_vulns3.nasl
 lib/nessus/plugins/mantis_xss.nasl
 lib/nessus/plugins/marconi_dos.nasl
 lib/nessus/plugins/master_index_search.nasl
@@ -2643,6 +2912,7 @@ lib/nessus/plugins/mdaemon_dele_dos.nasl
 lib/nessus/plugins/mdaemon_dos.nasl
 lib/nessus/plugins/mdaemon_imap_server_dos.nasl
 lib/nessus/plugins/mdaemon_imap_server_dos2.nasl
+lib/nessus/plugins/mdaemon_local_privileges.nasl
 lib/nessus/plugins/mdaemon_mail_server_dos.nasl
 lib/nessus/plugins/mdaemon_webconfig.nasl
 lib/nessus/plugins/mdaemon_worldclient.nasl
@@ -2657,10 +2927,12 @@ lib/nessus/plugins/mercur_auth_overflow.nasl
 lib/nessus/plugins/mercure_expn_overflow.nasl
 lib/nessus/plugins/mercure_imap_read_any_file.nasl
 lib/nessus/plugins/mercure_webview.nasl
+lib/nessus/plugins/mercury_mail_stack.nasl
 lib/nessus/plugins/messenger_ms03-043.nasl
 lib/nessus/plugins/metadot_sql_injection.nasl
 lib/nessus/plugins/metainfo_mail.nasl
 lib/nessus/plugins/mibiisa_overflow.nasl
+lib/nessus/plugins/minibb_sql.nasl
 lib/nessus/plugins/minibb_xss.nasl
 lib/nessus/plugins/miniportail_admin_access.nasl
 lib/nessus/plugins/minivend_view_page.nasl
@@ -2692,14 +2964,17 @@ lib/nessus/plugins/moniwiki_xss.nasl
 lib/nessus/plugins/monkeyweb_post_DoS.nasl
 lib/nessus/plugins/monkeyweb_too_big_post.nasl
 lib/nessus/plugins/moodle_php_reply_variable_xss.nasl
+lib/nessus/plugins/moodle_sql_inject.nasl
 lib/nessus/plugins/moodle_unknown_vuln.nasl
 lib/nessus/plugins/moodle_xss.nasl
+lib/nessus/plugins/moonlit_virus.nasl
 lib/nessus/plugins/mountd_overflow.nasl
 lib/nessus/plugins/mozilla_certif_handle_dos.nasl
 lib/nessus/plugins/mozilla_default_perms.nasl
 lib/nessus/plugins/mozilla_firefox_cache_file.nasl
 lib/nessus/plugins/mozilla_firefox_code_exec.nasl
 lib/nessus/plugins/mozilla_firefox_files_rm.nasl
+lib/nessus/plugins/mozilla_firefox_img.nasl
 lib/nessus/plugins/mozilla_firefox_xul_spoof.nasl
 lib/nessus/plugins/mozilla_multiple_flaws.nasl
 lib/nessus/plugins/mozilla_soapparameter_overflow.nasl
@@ -2784,6 +3059,7 @@ lib/nessus/plugins/ndcgi.nasl
 lib/nessus/plugins/nds_web_based_browsing.nasl
 lib/nessus/plugins/neoteris_ive_xss.nasl
 lib/nessus/plugins/nessus_detect.nasl
+lib/nessus/plugins/nessus_tcp_scanner.nes
 lib/nessus/plugins/nestea.nasl
 lib/nessus/plugins/netasq.nasl
 lib/nessus/plugins/netauth.nasl
@@ -2803,6 +3079,10 @@ lib/nessus/plugins/netinfo_detect.nasl
 lib/nessus/plugins/netinfo_passwd.nasl
 lib/nessus/plugins/netinfo_rpc.nasl
 lib/nessus/plugins/netobserve_command_execution.nasl
+lib/nessus/plugins/netop.inc
+lib/nessus/plugins/netop_detect_tcp.nasl
+lib/nessus/plugins/netop_detect_udp.nasl
+lib/nessus/plugins/netop_infopublic.nasl
 lib/nessus/plugins/netscape_PageServices.nasl
 lib/nessus/plugins/netscape_accept_overflow.nasl
 lib/nessus/plugins/netscape_adminpw.nasl
@@ -2851,9 +3131,11 @@ lib/nessus/plugins/nokia_readfile.nasl
 lib/nessus/plugins/nortel_annex_default_pass.nasl
 lib/nessus/plugins/nortel_baystack_default_pass.nasl
 lib/nessus/plugins/nortel_cgiproc_dos.nasl
+lib/nessus/plugins/nortel_default_username_password.nasl
 lib/nessus/plugins/nortel_passport_default_pass.nasl
 lib/nessus/plugins/nortel_pwdless1.nasl
 lib/nessus/plugins/nortel_pwdless2.nasl
+lib/nessus/plugins/nortel_webadmin.nasl
 lib/nessus/plugins/notes_detection.nasl
 lib/nessus/plugins/notes_mta_dos.nasl
 lib/nessus/plugins/notesinicheck.nasl
@@ -2875,6 +3157,7 @@ lib/nessus/plugins/ntalk_detect.nasl
 lib/nessus/plugins/ntds_get_info.nasl
 lib/nessus/plugins/ntp_open.nasl
 lib/nessus/plugins/ntp_overflow.nasl
+lib/nessus/plugins/nucleus_multiple_vulns.nasl
 lib/nessus/plugins/nucleus_sql_injection.nasl
 lib/nessus/plugins/nuked_clan_cmd_exec.nasl
 lib/nessus/plugins/nuked_klan_file_include.nasl
@@ -2892,12 +3175,14 @@ lib/nessus/plugins/officescan_disclosure.nasl
 lib/nessus/plugins/oftpd_dos.nasl
 lib/nessus/plugins/oneorzero_flaws.nasl
 lib/nessus/plugins/oops_overflow.nasl
+lib/nessus/plugins/open_X11_server.nasl
 lib/nessus/plugins/open_all_ports_DoS.nasl
 lib/nessus/plugins/openbb_sql_injection.nasl
 lib/nessus/plugins/openbb_xss.nasl
 lib/nessus/plugins/openca_html_injection.nasl
 lib/nessus/plugins/openca_mult_sign_flaws.nasl
 lib/nessus/plugins/openca_sign_verif.nasl
+lib/nessus/plugins/opendchub.nasl
 lib/nessus/plugins/opendocman_access_control_bypass.nasl
 lib/nessus/plugins/openftpd_detection.nasl
 lib/nessus/plugins/openlink_overflow.nasl
@@ -2996,6 +3281,8 @@ lib/nessus/plugins/ows_overflow.nasl
 lib/nessus/plugins/p-news_priv_escalation.nasl
 lib/nessus/plugins/p-smash.nasl
 lib/nessus/plugins/pafiledb_cmd_exec.nasl
+lib/nessus/plugins/pafiledb_passwd_disclosure.nasl
+lib/nessus/plugins/pafiledb_path_disclosure.nasl
 lib/nessus/plugins/pafiledb_sql_injection.nasl
 lib/nessus/plugins/pafiledb_xss.nasl
 lib/nessus/plugins/pagelog_cgi.nasl
@@ -3034,12 +3321,14 @@ lib/nessus/plugins/phpMyAdmin_file_reading.nasl
 lib/nessus/plugins/phpMyAdmin_file_reading2.nasl
 lib/nessus/plugins/phpMyAdmin_multiple_flaws.nasl
 lib/nessus/plugins/phpMyAdmin_remote_cmd.nasl
+lib/nessus/plugins/phpMyAdmin_xss.nasl
 lib/nessus/plugins/phpMyExplorer.nasl
 lib/nessus/plugins/phpPgAdmin_file_reading.nasl
 lib/nessus/plugins/php_4_2_x_malformed_POST.nasl
 lib/nessus/plugins/php_4_3_0.nasl
 lib/nessus/plugins/php_4_3_x_safe_mode_include.nasl
 lib/nessus/plugins/php_apache_win32_default.nasl
+lib/nessus/plugins/php_arbitrary_file_access.nasl
 lib/nessus/plugins/php_arbitrary_file_upload.nasl
 lib/nessus/plugins/php_file_upload.nasl
 lib/nessus/plugins/php_fusion_db_backup_disclosure.nasl
@@ -3049,6 +3338,7 @@ lib/nessus/plugins/php_imap_overflow.nasl
 lib/nessus/plugins/php_log.nasl
 lib/nessus/plugins/php_mail_func_header_spoof.nasl
 lib/nessus/plugins/php_mem_disclosure.nasl
+lib/nessus/plugins/php_news_sql_inject.nasl
 lib/nessus/plugins/php_nuke_admin_cp.nasl
 lib/nessus/plugins/php_nuke_bb_smilies_passwd.nasl
 lib/nessus/plugins/php_nuke_galleryaddon.nasl
@@ -3063,13 +3353,18 @@ lib/nessus/plugins/php_socket_iovec_alloc_overflow.nasl
 lib/nessus/plugins/php_split_mime.nasl
 lib/nessus/plugins/php_strip_tags_memory_limit_vuln.nasl
 lib/nessus/plugins/phpay_info_disclosure.nasl
+lib/nessus/plugins/phpbb_code_injection.nasl
+lib/nessus/plugins/phpbb_detect.nasl
 lib/nessus/plugins/phpbb_fetch_all_sql_injection.nasl
+lib/nessus/plugins/phpbb_login_form_sql.nasl
 lib/nessus/plugins/phpbb_search_author_xss.nasl
 lib/nessus/plugins/phpbb_sql_injection.nasl
 lib/nessus/plugins/phpbb_sql_injection2.nasl
 lib/nessus/plugins/phpbb_sql_injection3.nasl
 lib/nessus/plugins/phpbb_xss.nasl
+lib/nessus/plugins/phpbugtracker_bug_sql.nasl
 lib/nessus/plugins/phpcatalog_sql_injection.nasl
+lib/nessus/plugins/phpcms_xss.nasl
 lib/nessus/plugins/phpcsl_xss.nasl
 lib/nessus/plugins/phpdig_code_injection.nasl
 lib/nessus/plugins/phpgedview_directory_traversal.nasl
@@ -3077,6 +3372,7 @@ lib/nessus/plugins/phpgedview_multiple_flaws.nasl
 lib/nessus/plugins/phpgroupware_file_include.nasl
 lib/nessus/plugins/phpgroupware_html_injection.nasl
 lib/nessus/plugins/phpgroupware_plaintext_cookie_auth_vuln.nasl
+lib/nessus/plugins/phpgroupware_remote_cmd.nasl
 lib/nessus/plugins/phpgroupware_remote_file_include.nasl
 lib/nessus/plugins/phpgroupware_server_side_exec_vuln.nasl
 lib/nessus/plugins/phpgroupware_sql_injection.nasl
@@ -3084,11 +3380,15 @@ lib/nessus/plugins/phpgroupware_xss.nasl
 lib/nessus/plugins/phpinfo.nasl
 lib/nessus/plugins/phpix.nasl
 lib/nessus/plugins/phpix_cmd_exec.nasl
+lib/nessus/plugins/phpkit_multiple_flaws.nasl
+lib/nessus/plugins/phplive_unspecified_vuln.nasl
 lib/nessus/plugins/phpmybackpro_multiple_flaws.nasl
 lib/nessus/plugins/phpmyfaq_action_parameter_flaw.nasl
 lib/nessus/plugins/phpmyfaq_admin_bypass.nasl
 lib/nessus/plugins/phpping_code_execution.nasl
+lib/nessus/plugins/phpprojekt_auth_bypass.nasl
 lib/nessus/plugins/phprocketaddin_traversal.nasl
+lib/nessus/plugins/phpscheduleit_unknown_vuln.nasl
 lib/nessus/plugins/phpscheduleit_xss.nasl
 lib/nessus/plugins/phpshop_sql_injection.nasl
 lib/nessus/plugins/phptonuke_dir_trav.nasl
@@ -3117,7 +3417,10 @@ lib/nessus/plugins/poc32.nasl
 lib/nessus/plugins/podboard_forum_details_xss.nasl
 lib/nessus/plugins/polar_helpdesk_auth_bypass.nasl
 lib/nessus/plugins/pollit.nasl
+lib/nessus/plugins/pop2_unencrypted_cleartext_logins.nasl
+lib/nessus/plugins/pop3_func.inc
 lib/nessus/plugins/pop3_overflow.nasl
+lib/nessus/plugins/pop3_unencrypted_cleartext_logins.nasl
 lib/nessus/plugins/popper_mod.nasl
 lib/nessus/plugins/poprelayd_auth.nasl
 lib/nessus/plugins/popserver_detect.nasl
@@ -3131,11 +3434,13 @@ lib/nessus/plugins/postgresql_tempfile.nasl
 lib/nessus/plugins/postgresql_toascii_overflow.nasl
 lib/nessus/plugins/postgresql_unpassworded.nasl
 lib/nessus/plugins/postnuke_backdoor.nasl
+lib/nessus/plugins/postnuke_detect.nasl
 lib/nessus/plugins/postnuke_info_disclosure.nasl
 lib/nessus/plugins/postnuke_info_disclosure2.nasl
 lib/nessus/plugins/postnuke_install_php.nasl
 lib/nessus/plugins/postnuke_multiple_xss.nasl
 lib/nessus/plugins/postnuke_news_xss.nasl
+lib/nessus/plugins/postnuke_pnTresMailer_traversal.nasl
 lib/nessus/plugins/postnuke_rating_dos.nasl
 lib/nessus/plugins/postnuke_reviews_xss.nasl
 lib/nessus/plugins/postnuke_sql_injection.nasl
@@ -3143,6 +3448,7 @@ lib/nessus/plugins/pound_format_strings.nasl
 lib/nessus/plugins/powerplay.nasl
 lib/nessus/plugins/powerportal_path_disclosure.nasl
 lib/nessus/plugins/powerportal_privmsg_html_injection.nasl
+lib/nessus/plugins/powerportal_sql_injection.nasl
 lib/nessus/plugins/powerup_information_disclosure.nasl
 lib/nessus/plugins/pptp_detect.nasl
 lib/nessus/plugins/printenv.nasl
@@ -3208,6 +3514,7 @@ lib/nessus/plugins/readdesigncheck.nasl
 lib/nessus/plugins/realplayer_6011.nasl
 lib/nessus/plugins/realplayer_file_handler_overflow.nasl
 lib/nessus/plugins/realplayer_png_heap_corruption.nasl
+lib/nessus/plugins/realplayer_skin_remote_overflow.nasl
 lib/nessus/plugins/realplayer_undisclosed_vulns.nasl
 lib/nessus/plugins/realserver_defaultcfg.nasl
 lib/nessus/plugins/realserver_disclosure.nasl
@@ -3340,6 +3647,7 @@ lib/nessus/plugins/redhat-RHSA-2003-268.nasl
 lib/nessus/plugins/redhat-RHSA-2003-270.nasl
 lib/nessus/plugins/redhat-RHSA-2003-274.nasl
 lib/nessus/plugins/redhat-RHSA-2003-280.nasl
+lib/nessus/plugins/redhat-RHSA-2003-282.nasl
 lib/nessus/plugins/redhat-RHSA-2003-284.nasl
 lib/nessus/plugins/redhat-RHSA-2003-285.nasl
 lib/nessus/plugins/redhat-RHSA-2003-289.nasl
@@ -3476,11 +3784,20 @@ lib/nessus/plugins/redhat-RHSA-2004-480.nasl
 lib/nessus/plugins/redhat-RHSA-2004-486.nasl
 lib/nessus/plugins/redhat-RHSA-2004-494.nasl
 lib/nessus/plugins/redhat-RHSA-2004-498.nasl
+lib/nessus/plugins/redhat-RHSA-2004-543.nasl
 lib/nessus/plugins/redhat-RHSA-2004-546.nasl
+lib/nessus/plugins/redhat-RHSA-2004-562.nasl
 lib/nessus/plugins/redhat-RHSA-2004-569.nasl
+lib/nessus/plugins/redhat-RHSA-2004-577.nasl
+lib/nessus/plugins/redhat-RHSA-2004-585.nasl
 lib/nessus/plugins/redhat-RHSA-2004-591.nasl
+lib/nessus/plugins/redhat-RHSA-2004-592.nasl
 lib/nessus/plugins/redhat-RHSA-2004-597.nasl
 lib/nessus/plugins/redhat-RHSA-2004-604.nasl
+lib/nessus/plugins/redhat-RHSA-2004-609.nasl
+lib/nessus/plugins/redhat-RHSA-2004-611.nasl
+lib/nessus/plugins/redhat-RHSA-2004-615.nasl
+lib/nessus/plugins/redhat-RHSA-2004-632.nasl
 lib/nessus/plugins/redhat_fixes.nasl
 lib/nessus/plugins/redhat_update_level.nasl
 lib/nessus/plugins/relative_field_vulnerability.nasl
@@ -3579,6 +3896,7 @@ lib/nessus/plugins/samba_possible_overflow.nasl
 lib/nessus/plugins/samba_tng_flaws.nasl
 lib/nessus/plugins/samba_trans2open_overflow.nasl
 lib/nessus/plugins/samba_unicode_overflow.nasl
+lib/nessus/plugins/samba_wildcard.nasl
 lib/nessus/plugins/sambar_DoS.nasl
 lib/nessus/plugins/sambar_cgi.nasl
 lib/nessus/plugins/sambar_cgi_path_disclosure.nasl
@@ -3607,6 +3925,8 @@ lib/nessus/plugins/sawmill_password.nasl
 lib/nessus/plugins/scozbook.nasl
 lib/nessus/plugins/scriptlogic_hidden_share.nasl
 lib/nessus/plugins/sdbsearch.nasl
+lib/nessus/plugins/securecrt_command_execution.nasl
+lib/nessus/plugins/securecrt_remote_overflow.nasl
 lib/nessus/plugins/securemote.nasl
 lib/nessus/plugins/securemote_info_leak.nasl
 lib/nessus/plugins/sedum_dos.nasl
@@ -3639,6 +3959,7 @@ lib/nessus/plugins/ser_missing_to_in_ack_dos.nasl
 lib/nessus/plugins/ser_register_overflow.nasl
 lib/nessus/plugins/serendipity_http_splitting.nasl
 lib/nessus/plugins/serendipity_sql.nasl
+lib/nessus/plugins/serendipity_xss.nasl
 lib/nessus/plugins/servletExec_DoS.nasl
 lib/nessus/plugins/servletExec_File_Reading.nasl
 lib/nessus/plugins/servletExec_Path_Disclosure.nasl
@@ -3681,6 +4002,7 @@ lib/nessus/plugins/siteframe_xss.nasl
 lib/nessus/plugins/sitescope_management_server.nasl
 lib/nessus/plugins/sitescope_web_admin_server.nasl
 lib/nessus/plugins/six_webboard.nasl
+lib/nessus/plugins/slimftpd_overflow.nasl
 lib/nessus/plugins/slmail.nasl
 lib/nessus/plugins/slmail27.nasl
 lib/nessus/plugins/slmail_helo.nasl
@@ -3849,6 +4171,8 @@ lib/nessus/plugins/smb_nt_ms04-032.nasl
 lib/nessus/plugins/smb_nt_ms04-033.nasl
 lib/nessus/plugins/smb_nt_ms04-034.nasl
 lib/nessus/plugins/smb_nt_ms04-037.nasl
+lib/nessus/plugins/smb_nt_ms04-039.nasl
+lib/nessus/plugins/smb_nt_ms04-040.nasl
 lib/nessus/plugins/smb_null_params_dos.nasl
 lib/nessus/plugins/smb_reg_MTS_access.nasl
 lib/nessus/plugins/smb_reg_autologon.nasl
@@ -4479,6 +4803,8 @@ lib/nessus/plugins/solaris7_114944.nasl
 lib/nessus/plugins/solaris7_115565.nasl
 lib/nessus/plugins/solaris7_116456.nasl
 lib/nessus/plugins/solaris7_116858.nasl
+lib/nessus/plugins/solaris7_118239.nasl
+lib/nessus/plugins/solaris7_118313.nasl
 lib/nessus/plugins/solaris7_x86_106542.nasl
 lib/nessus/plugins/solaris7_x86_106737.nasl
 lib/nessus/plugins/solaris7_x86_106794.nasl
@@ -4582,6 +4908,8 @@ lib/nessus/plugins/solaris7_x86_114945.nasl
 lib/nessus/plugins/solaris7_x86_115429.nasl
 lib/nessus/plugins/solaris7_x86_115566.nasl
 lib/nessus/plugins/solaris7_x86_116457.nasl
+lib/nessus/plugins/solaris7_x86_118240.nasl
+lib/nessus/plugins/solaris7_x86_118314.nasl
 lib/nessus/plugins/solaris8_108528.nasl
 lib/nessus/plugins/solaris8_108773.nasl
 lib/nessus/plugins/solaris8_108835.nasl
@@ -4695,7 +5023,10 @@ lib/nessus/plugins/solaris8_114802.nasl
 lib/nessus/plugins/solaris8_114984.nasl
 lib/nessus/plugins/solaris8_115797.nasl
 lib/nessus/plugins/solaris8_116455.nasl
+lib/nessus/plugins/solaris8_116965.nasl
 lib/nessus/plugins/solaris8_116973.nasl
+lib/nessus/plugins/solaris8_116984.nasl
+lib/nessus/plugins/solaris8_116986.nasl
 lib/nessus/plugins/solaris8_117000.nasl
 lib/nessus/plugins/solaris8_x86_108529.nasl
 lib/nessus/plugins/solaris8_x86_108774.nasl
@@ -4801,7 +5132,10 @@ lib/nessus/plugins/solaris8_x86_114674.nasl
 lib/nessus/plugins/solaris8_x86_114985.nasl
 lib/nessus/plugins/solaris8_x86_115798.nasl
 lib/nessus/plugins/solaris8_x86_116442.nasl
+lib/nessus/plugins/solaris8_x86_116966.nasl
 lib/nessus/plugins/solaris8_x86_116974.nasl
+lib/nessus/plugins/solaris8_x86_116985.nasl
+lib/nessus/plugins/solaris8_x86_116987.nasl
 lib/nessus/plugins/solaris8_x86_117001.nasl
 lib/nessus/plugins/solaris9_112233.nasl
 lib/nessus/plugins/solaris9_112601.nasl
@@ -4849,6 +5183,7 @@ lib/nessus/plugins/solaris9_114125.nasl
 lib/nessus/plugins/solaris9_114133.nasl
 lib/nessus/plugins/solaris9_114135.nasl
 lib/nessus/plugins/solaris9_114332.nasl
+lib/nessus/plugins/solaris9_114344.nasl
 lib/nessus/plugins/solaris9_114361.nasl
 lib/nessus/plugins/solaris9_114495.nasl
 lib/nessus/plugins/solaris9_114564.nasl
@@ -4874,10 +5209,12 @@ lib/nessus/plugins/solaris9_116453.nasl
 lib/nessus/plugins/solaris9_116489.nasl
 lib/nessus/plugins/solaris9_116494.nasl
 lib/nessus/plugins/solaris9_116559.nasl
+lib/nessus/plugins/solaris9_116774.nasl
 lib/nessus/plugins/solaris9_116807.nasl
 lib/nessus/plugins/solaris9_117071.nasl
 lib/nessus/plugins/solaris9_117162.nasl
 lib/nessus/plugins/solaris9_117171.nasl
+lib/nessus/plugins/solaris9_117455.nasl
 lib/nessus/plugins/solaris9_x86_112234.nasl
 lib/nessus/plugins/solaris9_x86_112662.nasl
 lib/nessus/plugins/solaris9_x86_112786.nasl
@@ -4901,6 +5238,7 @@ lib/nessus/plugins/solaris9_x86_114242.nasl
 lib/nessus/plugins/solaris9_x86_114273.nasl
 lib/nessus/plugins/solaris9_x86_114328.nasl
 lib/nessus/plugins/solaris9_x86_114342.nasl
+lib/nessus/plugins/solaris9_x86_114345.nasl
 lib/nessus/plugins/solaris9_x86_114354.nasl
 lib/nessus/plugins/solaris9_x86_114362.nasl
 lib/nessus/plugins/solaris9_x86_114432.nasl
@@ -4938,6 +5276,7 @@ lib/nessus/plugins/solaris9_x86_116341.nasl
 lib/nessus/plugins/solaris9_x86_116454.nasl
 lib/nessus/plugins/solaris9_x86_116558.nasl
 lib/nessus/plugins/solaris9_x86_116560.nasl
+lib/nessus/plugins/solaris9_x86_116775.nasl
 lib/nessus/plugins/solaris9_x86_116808.nasl
 lib/nessus/plugins/solaris9_x86_117072.nasl
 lib/nessus/plugins/solaris9_x86_117163.nasl
@@ -4952,6 +5291,7 @@ lib/nessus/plugins/spyke_flaws.nasl
 lib/nessus/plugins/sql_injection.nasl
 lib/nessus/plugins/sqlqhit_information_disclosure.nasl
 lib/nessus/plugins/squid_dos.nasl
+lib/nessus/plugins/squid_mem_disclosure.nasl
 lib/nessus/plugins/squid_ntlm.nasl
 lib/nessus/plugins/squid_null_url_auth_bypass.nasl
 lib/nessus/plugins/squid_overflows.nasl
@@ -4960,6 +5300,7 @@ lib/nessus/plugins/squirrelmail_143.nasl
 lib/nessus/plugins/squirrelmail_detect.nasl
 lib/nessus/plugins/squirrelmail_from_header_html_injection.nasl
 lib/nessus/plugins/squirrelmail_html_injection_vuln.nasl
+lib/nessus/plugins/squirrelmail_html_injection_vuln2.nasl
 lib/nessus/plugins/squirremail_cross_site_scripting.nasl
 lib/nessus/plugins/squirremail_multiple_flaws.nasl
 lib/nessus/plugins/sscd_input.nasl
@@ -4983,6 +5324,7 @@ lib/nessus/plugins/ssh_proto_version.nasl
 lib/nessus/plugins/ssh_scp.nasl
 lib/nessus/plugins/ssh_setsid.nasl
 lib/nessus/plugins/ssh_settings.nasl
+lib/nessus/plugins/ssl_cert_expiry.nasl
 lib/nessus/plugins/ssl_ciphers.nes
 lib/nessus/plugins/ssl_funcs.inc
 lib/nessus/plugins/ssltest.nasl
@@ -5117,6 +5459,9 @@ lib/nessus/plugins/suse_SA_2004_035.nasl
 lib/nessus/plugins/suse_SA_2004_037.nasl
 lib/nessus/plugins/suse_SA_2004_038.nasl
 lib/nessus/plugins/suse_SA_2004_039.nasl
+lib/nessus/plugins/suse_SA_2004_040.nasl
+lib/nessus/plugins/suse_SA_2004_041.nasl
+lib/nessus/plugins/suse_SA_2004_043.nasl
 lib/nessus/plugins/suse_cgi_bin_sdb.nasl
 lib/nessus/plugins/suse_identd.nasl
 lib/nessus/plugins/swat_detect.nasl
@@ -5141,6 +5486,7 @@ lib/nessus/plugins/tcp_seq_window.nasl
 lib/nessus/plugins/tcpip_ambiguities.nasl
 lib/nessus/plugins/teardrop.nasl
 lib/nessus/plugins/technote.nasl
+lib/nessus/plugins/teekai_track_online_xss.nasl
 lib/nessus/plugins/telcondex.nasl
 lib/nessus/plugins/telnet.nasl
 lib/nessus/plugins/telnet_func.inc
@@ -5165,6 +5511,8 @@ lib/nessus/plugins/thttpd_virtualhost_escape.nasl
 lib/nessus/plugins/thunderbird_multiple_flaws.nasl
 lib/nessus/plugins/tikiwiki_multiple_input_flaws.nasl
 lib/nessus/plugins/tikiwiki_unauthorized_access.nasl
+lib/nessus/plugins/tikiwiki_xss.nasl
+lib/nessus/plugins/timbuktu_detect.nasl
 lib/nessus/plugins/timesink_detection.nasl
 lib/nessus/plugins/tiny_proxy_heap_overflow.nasl
 lib/nessus/plugins/tinyweb.nasl
@@ -5182,6 +5530,8 @@ lib/nessus/plugins/tomcat_snoop.nasl
 lib/nessus/plugins/tomcat_source_exposure.nasl
 lib/nessus/plugins/tomcat_srcjsp_malformed_request.nasl
 lib/nessus/plugins/tomcat_status.nasl
+lib/nessus/plugins/torrent_traversal.nasl
+lib/nessus/plugins/torrent_xss.nasl
 lib/nessus/plugins/torrentstrader_sql.nasl
 lib/nessus/plugins/torturecgis.nasl
 lib/nessus/plugins/traceroute.nasl
@@ -5269,6 +5619,7 @@ lib/nessus/plugins/vxworks_ftpd.nasl
 lib/nessus/plugins/vxworks_ftpdDOS.nasl
 lib/nessus/plugins/w32_spybot_worm_variant.nasl
 lib/nessus/plugins/w3msql_overflow.nasl
+lib/nessus/plugins/w3who_dll.nasl
 lib/nessus/plugins/w_agora_dir_traversal.nasl
 lib/nessus/plugins/w_agora_input_vulnerabilities.nasl
 lib/nessus/plugins/wackowiki_xss.nasl
@@ -5284,6 +5635,7 @@ lib/nessus/plugins/webapp_dir_traversal.nasl
 lib/nessus/plugins/webc_cgi_installed.nasl
 lib/nessus/plugins/webc_cgi_overflows.nasl
 lib/nessus/plugins/webcalendar_file_read.nasl
+lib/nessus/plugins/webcalendar_sql_injection.nasl
 lib/nessus/plugins/webcam_watchdog_result_xss.nasl
 lib/nessus/plugins/webcart.nasl
 lib/nessus/plugins/webcart_cmd_exec.nasl
@@ -5298,6 +5650,7 @@ lib/nessus/plugins/webfind.nasl
 lib/nessus/plugins/webfroot_shoutbox_file_injection.nasl
 lib/nessus/plugins/webfroot_shoutbox_traversal.nasl
 lib/nessus/plugins/webgais.nasl
+lib/nessus/plugins/webgui_unspecified_vuln.nasl
 lib/nessus/plugins/webhancer_detection.nasl
 lib/nessus/plugins/weblogic_adm_servlet.nasl
 lib/nessus/plugins/weblogic_casigned_cert_spoofing.nasl
@@ -5341,6 +5694,7 @@ lib/nessus/plugins/wihphoto_file_read.nasl
 lib/nessus/plugins/wildtangent_detection.nasl
 lib/nessus/plugins/win_trinoo.nasl
 lib/nessus/plugins/winamp_buffer_overflow.nasl
+lib/nessus/plugins/winamp_in_cdda_buffer_overflow.nasl
 lib/nessus/plugins/windmail.nasl
 lib/nessus/plugins/windows_asn1_vuln_ntlm.nasl
 lib/nessus/plugins/windows_terminal_services.nasl
@@ -5353,6 +5707,7 @@ lib/nessus/plugins/winmx_installed.nasl
 lib/nessus/plugins/winnt_dns_flood.nasl
 lib/nessus/plugins/winnt_pptp_dos.nasl
 lib/nessus/plugins/winnuke.nasl
+lib/nessus/plugins/wins_overflow.nasl
 lib/nessus/plugins/wins_udp_flood.nasl
 lib/nessus/plugins/winsatan.nasl
 lib/nessus/plugins/winsyslog_dos.nasl
@@ -5377,6 +5732,7 @@ lib/nessus/plugins/wsftp_cwd_dos.nasl
 lib/nessus/plugins/wsftp_file_path_parsing_dos.nasl
 lib/nessus/plugins/wsftp_multiple_flaws.nasl
 lib/nessus/plugins/wsftp_overflows.nasl
+lib/nessus/plugins/wsftp_overflows2.nasl
 lib/nessus/plugins/wsftp_stat_buf_overflow.nasl
 lib/nessus/plugins/wsmp3d_cmd_exec.nasl
 lib/nessus/plugins/wu_ftpd_abor_priviledge_escalation.nasl
@@ -5444,12 +5800,14 @@ lib/nessus/plugins/xtreme_gallery_sql_injection.nasl
 lib/nessus/plugins/xtux_server.nasl
 lib/nessus/plugins/yabb.nasl
 lib/nessus/plugins/yabb_gold_input_validation.nasl
+lib/nessus/plugins/yabb_shadow_bbcode_tag.nasl
 lib/nessus/plugins/yabb_xss.nasl
 lib/nessus/plugins/yabbse_cmd_exec.nasl
 lib/nessus/plugins/yahoo_dos.nasl
 lib/nessus/plugins/yahoo_installed.nasl
 lib/nessus/plugins/yahoo_msg_running.nasl
 lib/nessus/plugins/yapig_remote_vuln.nasl
+lib/nessus/plugins/yardradius_overflow.nasl
 lib/nessus/plugins/yppasswdd.nasl
 lib/nessus/plugins/zanfi_cms_file_include.nasl
 lib/nessus/plugins/zebra_dos.nasl
@@ -5469,6 +5827,7 @@ lib/nessus/plugins/zope_invalid_query_path_disclosure.nasl
 lib/nessus/plugins/zope_multiple_flaws.nasl
 lib/nessus/plugins/zope_path_disclosure.nasl
 lib/nessus/plugins/zope_zclass.nasl
+lib/nessus/plugins/zyxel_http_config_reset.nasl
 lib/nessus/plugins/zyxel_pwd.nasl
 lib/nessus/plugins_factory/Makefile
 lib/nessus/plugins_factory/libtool
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 9f8c739fdfce..ba92e4f4b58d 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -11,7 +11,7 @@
 #  WITHOUT_NESSUS_GTK
 
 PORTNAME=	nessus
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.2a
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -76,6 +76,14 @@ post-install:
 		> ${PREFIX}/etc/nessus/nessusd.rules.dist
 	@${CHMOD} 644 ${PREFIX}/etc/nessus/nessusd.conf.dist \
 		${PREFIX}/etc/nessus/nessusd.rules.dist
+	@if [ ! -f ${PREFIX}/etc/nessus/nessusd.conf ]; then \
+		${CP} -p ${PREFIX}/etc/nessus/nessusd.conf.dist \
+			${PREFIX}/etc/nessus/nessusd.conf; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/nessus/nessusd.rules ]; then \
+		${CP} -p ${PREFIX}/etc/nessus/nessusd.rules.dist \
+			${PREFIX}/etc/nessus/nessusd.rules; \
+	fi
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/move_nessus
 .if ! exists(${PREFIX}/var/CA/serverkey.pem)
 .if ! defined(BATCH)
diff --git a/security/nessus/distinfo b/security/nessus/distinfo
index 1e06042c18b5..8bb4203c335d 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1,2 +1,2 @@
-MD5 (nessus/nessus-core-2.2.0.tar.gz) = 16c1b51d81896415af9dfc91a7faf8d9
-SIZE (nessus/nessus-core-2.2.0.tar.gz) = 688545
+MD5 (nessus/nessus-core-2.2.2a.tar.gz) = c307b37336921462fb21ca09aca407ca
+SIZE (nessus/nessus-core-2.2.2a.tar.gz) = 676390
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index 1919a502ea15..fb04d9d6a30c 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -1,13 +1,14 @@
-etc/rc.d/nessusd.sh
 bin/nessus
+bin/nessus-fetch
 bin/nessus-mkcert-client
 bin/nessus-mkrand
 @unexec if cmp -s %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; then rm -f %D/etc/nessus/nessusd.conf; fi
 @unexec if cmp -s %D/etc/nessus/nessusd.rules.dist %D/etc/nessus/nessusd.rules; then rm -f %D/etc/nessus/nessusd.rules; fi
 etc/nessus/nessusd.conf.dist
 etc/nessus/nessusd.rules.dist
-@exec if [ ! -f %D/etc/nessus/nessusd.conf ]; then cp %D/etc/nessus/nessusd.conf %D/etc/nessus/nessusd.conf; fi
-@exec if [ ! -f %D/etc/nessus/nessusd.rules ]; then cp %D/etc/nessus/nessusd.onf %D/etc/nessus/nessusd.onf; fi
+@exec if [ ! -f %D/etc/nessus/nessusd.conf ]; then cp -p %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; fi
+@exec if [ ! -f %D/etc/nessus/nessusd.rules ]; then cp -p %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; fi
+etc/rc.d/nessusd.sh
 include/nessus/config.h
 include/nessus/includes.h
 include/nessus/nessus-devel.h
@@ -25,6 +26,7 @@ sbin/nessusd
 @exec mkdir -p %D/var/nessus/jobs
 @exec mkdir -p %D/var/nessus/logs
 @exec mkdir -p %D/var/nessus/users
+@unexec if [ ! -s %D/var/nessus/logs/nessusd.messages ]; then rm %D/var/nessus/logs/nessusd.messages; fi
 @unexec rmdir %D/var/nessus/jobs 2>/dev/null || true
 @unexec rmdir %D/var/nessus/logs 2>/dev/null || true
 @unexec rmdir %D/var/nessus/users 2>/dev/null || true