diff --git a/net/nagios/nagios/Makefile b/net/nagios/nagios/Makefile
index 8eddeed39d2..665fcb46d38 100644
--- a/net/nagios/nagios/Makefile
+++ b/net/nagios/nagios/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.47 2011/07/08 22:31:59 robert Exp $
+# $OpenBSD: Makefile,v 1.48 2011/09/05 14:56:45 sthen Exp $
 
 COMMENT-main=	host and service monitor
 COMMENT-web=	cgis and webpages for nagios
 
-V=		3.2.3
-REVISION-main=	3
-REVISION-web=	1
-DISTNAME=	nagios-${V}
-PKGNAME-main=	nagios-${V}
-PKGNAME-web=	nagios-web-${V}
+V=		3.3.1
+DISTNAME=	nagios-$V
+PKGNAME-main=	nagios-$V
+PKGNAME-web=	nagios-web-$V
+WRKDIST=	${WRKDIR}/nagios
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.nagios.org/
diff --git a/net/nagios/nagios/distinfo b/net/nagios/nagios/distinfo
index 48bd147f48b..3a207a94bc0 100644
--- a/net/nagios/nagios/distinfo
+++ b/net/nagios/nagios/distinfo
@@ -1,5 +1,5 @@
-MD5 (nagios-3.2.3.tar.gz) = /hvkbml2pSrNsCGngrXQSw==
-RMD160 (nagios-3.2.3.tar.gz) = PAkDQGlBbF9N1QceNFFrEVTCdrI=
-SHA1 (nagios-3.2.3.tar.gz) = /LLAFsG4A7rHFELQ7oN1tzeQZCE=
-SHA256 (nagios-3.2.3.tar.gz) = fshQpNHY2O42sGQZrJEmleKZYmQcdXzyEwGxvvyyNDQ=
-SIZE (nagios-3.2.3.tar.gz) = 3249447
+MD5 (nagios-3.3.1.tar.gz) = yTU1TODXimO/q8MFX6d61Q==
+RMD160 (nagios-3.3.1.tar.gz) = ONQn+dE3unW4Tzv+Kpi3KnaPYVg=
+SHA1 (nagios-3.3.1.tar.gz) = eyUj3g2stRtRYt1T/EyQk5eAASU=
+SHA256 (nagios-3.3.1.tar.gz) = xOOc0xqKnugU34SP2TO4YRRl90m0hDJnKu9K5YSdllI=
+SIZE (nagios-3.3.1.tar.gz) = 1714630
diff --git a/net/nagios/nagios/patches/patch-base_Makefile_in b/net/nagios/nagios/patches/patch-base_Makefile_in
index 67b0ac14617..d2ea5372bcc 100644
--- a/net/nagios/nagios/patches/patch-base_Makefile_in
+++ b/net/nagios/nagios/patches/patch-base_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_Makefile_in,v 1.4 2008/03/18 20:25:11 sturm Exp $
---- base/Makefile.in.orig	Thu Feb 28 20:25:45 2008
-+++ base/Makefile.in	Sat Mar 15 19:47:52 2008
-@@ -202,9 +202,8 @@ install-unstripped:
+$OpenBSD: patch-base_Makefile_in,v 1.5 2011/09/05 14:56:46 sthen Exp $
+--- base/Makefile.in.orig	Sat Oct 23 11:00:59 2010
++++ base/Makefile.in	Tue Jul 26 13:58:39 2011
+@@ -204,9 +204,8 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
diff --git a/net/nagios/nagios/patches/patch-cgi_Makefile_in b/net/nagios/nagios/patches/patch-cgi_Makefile_in
index 4cb69e1d5d4..7ead9611dc7 100644
--- a/net/nagios/nagios/patches/patch-cgi_Makefile_in
+++ b/net/nagios/nagios/patches/patch-cgi_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-cgi_Makefile_in,v 1.4 2008/03/18 20:25:11 sturm Exp $
---- cgi/Makefile.in.orig	Thu Feb 28 20:26:36 2008
-+++ cgi/Makefile.in	Sat Mar 15 19:47:52 2008
-@@ -196,9 +196,9 @@ install-unstripped:
+$OpenBSD: patch-cgi_Makefile_in,v 1.5 2011/09/05 14:56:46 sthen Exp $
+--- cgi/Makefile.in.orig	Sat Oct 23 11:00:59 2010
++++ cgi/Makefile.in	Tue Jul 26 13:58:39 2011
+@@ -201,9 +201,9 @@ install-unstripped:
  	$(MAKE) install-basic
  
  install-basic:
diff --git a/net/nagios/nagios/patches/patch-configure b/net/nagios/nagios/patches/patch-configure
index e18cbee3a58..c78088555e4 100644
--- a/net/nagios/nagios/patches/patch-configure
+++ b/net/nagios/nagios/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
---- configure.orig	Tue Mar  9 18:39:59 2010
-+++ configure	Fri May 28 09:53:05 2010
-@@ -1044,7 +1044,7 @@ do
+$OpenBSD: patch-configure,v 1.12 2011/09/05 14:56:46 sthen Exp $
+--- configure.orig	Tue Jul 26 04:16:26 2011
++++ configure	Tue Jul 26 13:59:31 2011
+@@ -572,7 +572,7 @@ do
      ac_prev=sysconfdir ;;
    -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
    | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
@@ -10,9 +10,9 @@ $OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
  
    -target | --target | --targe | --targ | --tar | --ta | --t)
      ac_prev=target_alias ;;
-@@ -5651,20 +5651,20 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_cma_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_cma_pthread_create" >&6; }
+@@ -5130,20 +5130,20 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_cma_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_cma_pthread_create" >&6
  if test $ac_cv_lib_cma_pthread_create = yes; then
 -  THREADLIBS="$THREADLIBS -lpthread"
 +  THREADLIBS="$THREADLIBS -pthread"
@@ -22,10 +22,10 @@ $OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
  	have_pthreads="yes"
  fi
  
--{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
-+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
+-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
++echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -35,9 +35,9 @@ $OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5720,19 +5720,19 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+@@ -5202,19 +5202,19 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
  if test $ac_cv_lib_pthread_pthread_create = yes; then
 -  THREADLIBS="$THREADLIBS -lpthread"
 +  THREADLIBS="$THREADLIBS -pthread"
@@ -46,10 +46,10 @@ $OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
  if test $ac_cv_lib_pthread_pthread_create = yes; then
  	have_pthreads="yes"
  else
--		{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
-+		{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
-+echo $ECHO_N "checking for pthread_mutex_init in -pthread... $ECHO_C" >&6; }
+-		echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
++		echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
++echo $ECHO_N "checking for pthread_mutex_init in -pthread... $ECHO_C" >&6
  if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -59,16 +59,16 @@ $OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5788,7 +5788,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6; }
+@@ -5273,7 +5273,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6
  if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
 -  THREADLIBS="$THREADLIBS -lpthread"
 +  THREADLIBS="$THREADLIBS -pthread"
  fi
  
  	if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
-@@ -6127,7 +6127,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -5664,7 +5664,7 @@ cat >>confdefs.h <<_ACEOF
  #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
  _ACEOF
  
@@ -77,7 +77,7 @@ $OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
  
  
  
-@@ -6506,7 +6506,7 @@ echo $ECHO_N "checking for gdImagePng in -lgd (order 1
+@@ -6045,7 +6045,7 @@ echo $ECHO_N "checking for gdImagePng in -lgd (order 1
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_save_LIBS="$LIBS"
@@ -86,16 +86,16 @@ $OpenBSD: patch-configure,v 1.11 2010/08/28 09:20:13 sthen Exp $
  	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6562,7 +6562,7 @@ fi
- echo "${ECHO_T}yes" >&6; }
+@@ -6104,7 +6104,7 @@ fi
+ echo "${ECHO_T}yes" >&6
  
  			GDLIBFOUND=yep
 -			GDLIBS="-lgd -lttf -lpng -ljpeg -lz -lm"
 +			GDLIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm"
  
  	else
- 	  { echo "$as_me:$LINENO: result: no" >&5
-@@ -7527,9 +7527,9 @@ echo $ECHO_N "checking for linker flags for loadable m
+ 	  echo "$as_me:$LINENO: result: no" >&5
+@@ -7117,9 +7117,9 @@ echo $ECHO_N "checking for linker flags for loadable m
  			MOD_LDFLAGS="-shared"
  			MOD_CFLAGS="-fPIC"
  		;;
diff --git a/net/nagios/nagios/patches/patch-html_Makefile_in b/net/nagios/nagios/patches/patch-html_Makefile_in
index 777e459fd69..b09eed2b502 100644
--- a/net/nagios/nagios/patches/patch-html_Makefile_in
+++ b/net/nagios/nagios/patches/patch-html_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-html_Makefile_in,v 1.6 2009/09/12 12:35:20 sturm Exp $
---- html/Makefile.in.orig	Wed Jul  8 00:34:51 2009
-+++ html/Makefile.in	Thu Sep 10 07:15:44 2009
-@@ -33,46 +33,46 @@ distclean: clean
+$OpenBSD: patch-html_Makefile_in,v 1.7 2011/09/05 14:56:46 sthen Exp $
+--- html/Makefile.in.orig	Sun Jul 24 18:53:52 2011
++++ html/Makefile.in	Tue Jul 26 14:02:08 2011
+@@ -33,52 +33,52 @@ distclean: clean
  devclean: distclean
  
  install:
@@ -14,9 +14,11 @@ $OpenBSD: patch-html_Makefile_in,v 1.6 2009/09/12 12:35:20 sturm Exp $
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
 -	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
--	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+-#	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
@@ -26,9 +28,11 @@ $OpenBSD: patch-html_Makefile_in,v 1.6 2009/09/12 12:35:20 sturm Exp $
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
 +	$(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
-+	$(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
++#	$(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
  # Remove old HTML files (PHP files are used now)
  	rm -f $(DESTDIR)$(HTMLDIR)/index.html
  	rm -f $(DESTDIR)$(HTMLDIR)/main.html
@@ -45,12 +49,12 @@ $OpenBSD: patch-html_Makefile_in,v 1.6 2009/09/12 12:35:20 sturm Exp $
  	for file in contexthelp/*.html; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
 +	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
- 	for file in docs/*.html; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
-+	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done
- 	for file in docs/images/*.*; \
--	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
-+	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ #	for file in docs/*.html; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
++#	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ #	for file in docs/images/*.*; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
++#	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
  	for file in images/*.gif; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
 +	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
@@ -69,6 +73,13 @@ $OpenBSD: patch-html_Makefile_in,v 1.6 2009/09/12 12:35:20 sturm Exp $
  	for file in includes/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
 +	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes; done
+-	for file in includes/rss/*; \
++	for file in includes/rss/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
++	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
+ 	for file in includes/rss/extlib/*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
++	do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
  
  install-unstripped:
  	$(MAKE) install
diff --git a/net/nagios/nagios/patches/patch-include_config_h_in b/net/nagios/nagios/patches/patch-include_config_h_in
index 5230aa5041b..93408981f5c 100644
--- a/net/nagios/nagios/patches/patch-include_config_h_in
+++ b/net/nagios/nagios/patches/patch-include_config_h_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-include_config_h_in,v 1.6 2009/09/12 12:35:20 sturm Exp $
---- include/config.h.in.orig	Wed Jul  8 00:19:45 2009
-+++ include/config.h.in	Thu Sep 10 07:13:52 2009
-@@ -124,11 +124,6 @@
+$OpenBSD: patch-include_config_h_in,v 1.7 2011/09/05 14:56:46 sthen Exp $
+--- include/config.h.in.orig	Sat Oct 23 10:56:29 2010
++++ include/config.h.in	Tue Jul 26 13:58:39 2011
+@@ -135,11 +135,6 @@
  #endif
  #endif
  
@@ -13,7 +13,7 @@ $OpenBSD: patch-include_config_h_in,v 1.6 2009/09/12 12:35:20 sturm Exp $
  #undef HAVE_LIMITS_H
  #ifdef HAVE_LIMITS_H
  #include <limits.h>
-@@ -207,6 +202,11 @@
+@@ -218,6 +213,11 @@
  #undef HAVE_SYS_TIMEB_H
  #if HAVE_SYS_TIMEB_H
  #include <sys/timeb.h>
diff --git a/net/nagios/nagios/pkg/PLIST-web b/net/nagios/nagios/pkg/PLIST-web
index 92c3d157206..3723e534993 100644
--- a/net/nagios/nagios/pkg/PLIST-web
+++ b/net/nagios/nagios/pkg/PLIST-web
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-web,v 1.5 2009/09/12 12:35:20 sturm Exp $
+@comment $OpenBSD: PLIST-web,v 1.6 2011/09/05 14:56:46 sthen Exp $
 cgi-bin/nagios/
 @bin cgi-bin/nagios/avail.cgi
 @bin cgi-bin/nagios/cmd.cgi
@@ -82,191 +82,13 @@ nagios/contexthelp/N5.html
 nagios/contexthelp/N6.html
 nagios/contexthelp/N7.html
 nagios/docs/
-nagios/docs/about.html
-nagios/docs/activechecks.html
-nagios/docs/adaptive.html
-nagios/docs/addons.html
-nagios/docs/beginners.html
-nagios/docs/cachedchecks.html
-nagios/docs/cgiauth.html
-nagios/docs/cgiincludes.html
-nagios/docs/cgis.html
-nagios/docs/cgisecurity.html
-nagios/docs/checkscheduling.html
-nagios/docs/clusters.html
-nagios/docs/config.html
-nagios/docs/configcgi.html
-nagios/docs/configmain.html
-nagios/docs/configobject.html
-nagios/docs/customobjectvars.html
-nagios/docs/dependencies.html
-nagios/docs/dependencychecks.html
-nagios/docs/distributed.html
-nagios/docs/downtime.html
-nagios/docs/embeddedperl.html
-nagios/docs/epnplugins.html
-nagios/docs/escalations.html
-nagios/docs/eventhandlers.html
-nagios/docs/extcommands.html
-nagios/docs/faststartup.html
-nagios/docs/flapping.html
-nagios/docs/freshness.html
-nagios/docs/funstuff.html
-nagios/docs/hostchecks.html
 nagios/docs/images/
-nagios/docs/images/activechecks.png
-nagios/docs/images/cachedcheckgraphs.png
-nagios/docs/images/cachedchecks.png
-nagios/docs/images/cachedchecks1.png
-nagios/docs/images/cgi-avail-a.png
-nagios/docs/images/cgi-avail-b.png
-nagios/docs/images/cgi-cmd.png
-nagios/docs/images/cgi-config.png
-nagios/docs/images/cgi-extinfo-a.png
-nagios/docs/images/cgi-extinfo-b.png
-nagios/docs/images/cgi-extinfo-c.png
-nagios/docs/images/cgi-extinfo-d.png
-nagios/docs/images/cgi-histogram.png
-nagios/docs/images/cgi-history.png
-nagios/docs/images/cgi-notifications.png
-nagios/docs/images/cgi-outages.png
-nagios/docs/images/cgi-showlog.png
-nagios/docs/images/cgi-status-a.png
-nagios/docs/images/cgi-status-b.png
-nagios/docs/images/cgi-status-c.png
-nagios/docs/images/cgi-status-d.png
-nagios/docs/images/cgi-statusmap.png
-nagios/docs/images/cgi-statuswml.png
-nagios/docs/images/cgi-statuswrl.png
-nagios/docs/images/cgi-summary.png
-nagios/docs/images/cgi-tac.png
-nagios/docs/images/cgi-trends.png
-nagios/docs/images/checkmark.png
-nagios/docs/images/checktiming.png
-nagios/docs/images/configoverview.png
-nagios/docs/images/distributed.png
-nagios/docs/images/downtime.png
-nagios/docs/images/epn.png
-nagios/docs/images/eventhandlers.png
-nagios/docs/images/externalcommands.png
-nagios/docs/images/fast-startup.png
-nagios/docs/images/fast-startup1.png
-nagios/docs/images/fast-startup2.png
-nagios/docs/images/freshness.png
-nagios/docs/images/host-dependencies.png
-nagios/docs/images/important.gif
-nagios/docs/images/integrationoverview.png
-nagios/docs/images/interleaved1.png
-nagios/docs/images/interleaved2.png
-nagios/docs/images/interleaved3.png
-nagios/docs/images/logofullsize.png
-nagios/docs/images/monitoring-printers.png
-nagios/docs/images/monitoring-routers.png
-nagios/docs/images/monitoring-windows.png
-nagios/docs/images/mrtg-activehostchecks.png
-nagios/docs/images/mrtg-activelychecked.png
-nagios/docs/images/mrtg-activeservicechecks.png
-nagios/docs/images/mrtg-cachedchecks.png
-nagios/docs/images/mrtg-commandbuffers.png
-nagios/docs/images/mrtg-externalcommands.png
-nagios/docs/images/mrtg-hostperfstats.png
-nagios/docs/images/mrtg-hoststatechange.png
-nagios/docs/images/mrtg-passivechecks.png
-nagios/docs/images/mrtg-passivelychecked.png
-nagios/docs/images/mrtg-serviceperfstats.png
-nagios/docs/images/mrtg-servicestatechange.png
-nagios/docs/images/multiple-templates1.png
-nagios/docs/images/multiple-templates2.png
-nagios/docs/images/nagios.jpg
-nagios/docs/images/nagiosexchange.png
-nagios/docs/images/nagiossupport.png
-nagios/docs/images/ndoutils.png
-nagios/docs/images/network-outage1.png
-nagios/docs/images/network-outage2.png
-nagios/docs/images/noninterleaved1.png
-nagios/docs/images/noninterleaved2.png
-nagios/docs/images/note.gif
-nagios/docs/images/nrpe.png
-nagios/docs/images/nsca.png
-nagios/docs/images/nscpp.png
-nagios/docs/images/objects-commands.png
-nagios/docs/images/objects-contacts.png
-nagios/docs/images/objects-hosts.png
-nagios/docs/images/objects-services.png
-nagios/docs/images/objects-timeperiods.png
-nagios/docs/images/passivechecks.png
-nagios/docs/images/passivehosttranslation.png
-nagios/docs/images/plugins.png
-nagios/docs/images/predictive-dependency-checks.png
-nagios/docs/images/printer.png
-nagios/docs/images/reachability1.png
-nagios/docs/images/reachability2.png
-nagios/docs/images/reachability3.png
-nagios/docs/images/reachability4.png
-nagios/docs/images/redudancy.png
-nagios/docs/images/redundancy.png
-nagios/docs/images/security.png
-nagios/docs/images/security1.png
-nagios/docs/images/security2.png
-nagios/docs/images/security3.png
-nagios/docs/images/seealso.gif
-nagios/docs/images/service-dependencies.png
-nagios/docs/images/statetransitions.png
-nagios/docs/images/statetransitions2.png
-nagios/docs/images/stoprestart.png
-nagios/docs/images/switch.png
-nagios/docs/images/tcpwrappers.png
-nagios/docs/images/tip.gif
-nagios/docs/images/tuning.png
-nagios/docs/images/upto.gif
-nagios/docs/index.html
-nagios/docs/int-snmptrap.html
-nagios/docs/int-tcpwrappers.html
-nagios/docs/integration.html
-nagios/docs/knownissues.html
-nagios/docs/largeinstalltweaks.html
-nagios/docs/macrolist.html
-nagios/docs/macros.html
-nagios/docs/monitoring-linux.html
-nagios/docs/monitoring-netware.html
-nagios/docs/monitoring-printers.html
-nagios/docs/monitoring-publicservices.html
-nagios/docs/monitoring-routers.html
-nagios/docs/monitoring-windows.html
-nagios/docs/mrtggraphs.html
-nagios/docs/nagiostats.html
-nagios/docs/networkreachability.html
-nagios/docs/notifications.html
-nagios/docs/objectdefinitions.html
-nagios/docs/objectinheritance.html
-nagios/docs/objecttricks.html
-nagios/docs/oncallrotation.html
-nagios/docs/passivechecks.html
-nagios/docs/passivestatetranslation.html
-nagios/docs/perfdata.html
-nagios/docs/pluginapi.html
-nagios/docs/plugins.html
-nagios/docs/quickstart-fedora.html
-nagios/docs/quickstart-opensuse.html
-nagios/docs/quickstart-ubuntu.html
-nagios/docs/quickstart.html
-nagios/docs/redundancy.html
-nagios/docs/robots.txt
-nagios/docs/security.html
-nagios/docs/servicechecks.html
-nagios/docs/stalking.html
-nagios/docs/startstop.html
-nagios/docs/statetypes.html
-nagios/docs/timeperiods.html
-nagios/docs/toc.html
-nagios/docs/tuning.html
-nagios/docs/upgrading.html
-nagios/docs/verifyconfig.html
-nagios/docs/volatileservices.html
-nagios/docs/whatsnew.html
 nagios/images/
 nagios/images/NagiosEnterprises-whitebg-112x46.png
 nagios/images/ack.gif
+nagios/images/action-graph.gif
+nagios/images/action-nagios.gif
+nagios/images/action-orig.gif
 nagios/images/action.gif
 nagios/images/command.png
 nagios/images/comment.gif
@@ -285,6 +107,7 @@ nagios/images/extinfo.gif
 nagios/images/favicon.ico
 nagios/images/flapping.gif
 nagios/images/globe-support-150x150.png
+nagios/images/graph.gif
 nagios/images/greendot.gif
 nagios/images/histogram.png
 nagios/images/history.gif
@@ -293,11 +116,183 @@ nagios/images/info.png
 nagios/images/left.gif
 nagios/images/logofullsize.png
 nagios/images/logos/
+nagios/images/logos/aix.gd2
+nagios/images/logos/aix.gif
+nagios/images/logos/aix.jpg
+nagios/images/logos/aix.png
+nagios/images/logos/amiga.gd2
+nagios/images/logos/amiga.gif
+nagios/images/logos/amiga.jpg
+nagios/images/logos/amiga.png
+nagios/images/logos/apple.gd2
+nagios/images/logos/apple.gif
+nagios/images/logos/apple.jpg
+nagios/images/logos/apple.png
+nagios/images/logos/beos.gd2
+nagios/images/logos/beos.gif
+nagios/images/logos/beos.jpg
+nagios/images/logos/beos.png
+nagios/images/logos/bluetooth.png
+nagios/images/logos/caldera.gd2
+nagios/images/logos/caldera.gif
+nagios/images/logos/caldera.jpg
+nagios/images/logos/caldera.png
+nagios/images/logos/cat1900.gd2
+nagios/images/logos/cat2900.gd2
+nagios/images/logos/cat5000.gd2
+nagios/images/logos/database.gd2
+nagios/images/logos/database.gif
+nagios/images/logos/debian.gd2
+nagios/images/logos/debian.gif
+nagios/images/logos/debian.jpg
+nagios/images/logos/debian.png
+nagios/images/logos/desktop-server.gd2
+nagios/images/logos/desktop-server.gif
+nagios/images/logos/ethernet_card.png
+nagios/images/logos/fax.gd2
+nagios/images/logos/fax.gif
+nagios/images/logos/firewall.gd2
+nagios/images/logos/firewall.gif
+nagios/images/logos/freebsd40.gd2
+nagios/images/logos/freebsd40.gif
+nagios/images/logos/freebsd40.jpg
+nagios/images/logos/freebsd40.png
+nagios/images/logos/globe.png
+nagios/images/logos/graph.gif
+nagios/images/logos/hp-printer40.gd2
+nagios/images/logos/hp-printer40.gif
+nagios/images/logos/hp-printer40.jpg
+nagios/images/logos/hp-printer40.png
+nagios/images/logos/hpux.gd2
+nagios/images/logos/hpux.gif
+nagios/images/logos/hpux.jpg
+nagios/images/logos/hpux.png
+nagios/images/logos/hub.gd2
+nagios/images/logos/hub.gif
+nagios/images/logos/internet.gd2
+nagios/images/logos/internet.gif
+nagios/images/logos/internet_device.png
+nagios/images/logos/ip-pbx.gd2
+nagios/images/logos/ip-pbx.gif
+nagios/images/logos/irix.gd2
+nagios/images/logos/irix.gif
+nagios/images/logos/irix.jpg
+nagios/images/logos/irix.png
+nagios/images/logos/linux40.gd2
+nagios/images/logos/linux40.gif
+nagios/images/logos/linux40.jpg
+nagios/images/logos/linux40.png
+nagios/images/logos/logo.gd2
+nagios/images/logos/mac40.gd2
+nagios/images/logos/mac40.gif
+nagios/images/logos/mac40.jpg
+nagios/images/logos/mac40.png
+nagios/images/logos/mainframe.gd2
+nagios/images/logos/mainframe.gif
+nagios/images/logos/mandrake.gd2
+nagios/images/logos/mandrake.gif
+nagios/images/logos/mandrake.jpg
+nagios/images/logos/mandrake.png
+nagios/images/logos/monitor.png
 nagios/images/logos/nagios.gd2
 nagios/images/logos/nagios.gif
 nagios/images/logos/nagiosvrml.png
+nagios/images/logos/next.gd2
+nagios/images/logos/next.gif
+nagios/images/logos/next.jpg
+nagios/images/logos/next.png
+nagios/images/logos/ng-switch40.gd2
+nagios/images/logos/ng-switch40.gif
+nagios/images/logos/ng-switch40.jpg
+nagios/images/logos/ng-switch40.png
+nagios/images/logos/notebook.gd2
+nagios/images/logos/notebook.gif
+nagios/images/logos/novell40.gd2
+nagios/images/logos/novell40.gif
+nagios/images/logos/novell40.jpg
+nagios/images/logos/novell40.png
+nagios/images/logos/openbsd.gd2
+nagios/images/logos/openbsd.gif
+nagios/images/logos/openbsd.jpg
+nagios/images/logos/openbsd.png
+nagios/images/logos/printer.gd2
+nagios/images/logos/printer.gif
+nagios/images/logos/rack-server.gd2
+nagios/images/logos/rack-server.gif
+nagios/images/logos/redhat.gd2
+nagios/images/logos/redhat.gif
+nagios/images/logos/redhat.jpg
+nagios/images/logos/redhat.png
+nagios/images/logos/router.gd2
+nagios/images/logos/router.gif
+nagios/images/logos/router40.gd2
+nagios/images/logos/router40.gif
+nagios/images/logos/router40.jpg
+nagios/images/logos/router40.png
+nagios/images/logos/san.gd2
+nagios/images/logos/san.gif
+nagios/images/logos/satellite.png
+nagios/images/logos/server.png
+nagios/images/logos/signal.png
+nagios/images/logos/slackware.gd2
+nagios/images/logos/slackware.gif
+nagios/images/logos/slackware.jpg
+nagios/images/logos/slackware.png
+nagios/images/logos/stampede.gd2
+nagios/images/logos/stampede.gif
+nagios/images/logos/stampede.jpg
+nagios/images/logos/stampede.png
+nagios/images/logos/station.gd2
+nagios/images/logos/storm.gd2
+nagios/images/logos/storm.gif
+nagios/images/logos/storm.jpg
+nagios/images/logos/storm.png
+nagios/images/logos/sun40.gd2
+nagios/images/logos/sun40.gif
+nagios/images/logos/sun40.jpg
+nagios/images/logos/sun40.png
+nagios/images/logos/sunlogo.gd2
+nagios/images/logos/sunlogo.gif
+nagios/images/logos/sunlogo.jpg
+nagios/images/logos/sunlogo.png
+nagios/images/logos/switch.gd2
+nagios/images/logos/switch.gif
+nagios/images/logos/switch40.gd2
+nagios/images/logos/switch40.gif
+nagios/images/logos/switch40.jpg
+nagios/images/logos/switch40.png
+nagios/images/logos/thin-client.gd2
+nagios/images/logos/thin-client.gif
+nagios/images/logos/turbolinux.gd2
+nagios/images/logos/turbolinux.gif
+nagios/images/logos/turbolinux.jpg
+nagios/images/logos/turbolinux.png
+nagios/images/logos/ultrapenguin.gd2
+nagios/images/logos/ultrapenguin.gif
+nagios/images/logos/ultrapenguin.jpg
+nagios/images/logos/ultrapenguin.png
+nagios/images/logos/unicos.gd2
+nagios/images/logos/unicos.gif
+nagios/images/logos/unicos.jpg
+nagios/images/logos/unicos.png
 nagios/images/logos/unknown.gd2
 nagios/images/logos/unknown.gif
+nagios/images/logos/webcamera.png
+nagios/images/logos/wifi.gd2
+nagios/images/logos/wifi.gif
+nagios/images/logos/wifi_modem.png
+nagios/images/logos/win40.gd2
+nagios/images/logos/win40.gif
+nagios/images/logos/win40.jpg
+nagios/images/logos/win40.png
+nagios/images/logos/workstation.gd2
+nagios/images/logos/workstation.gif
+nagios/images/logos/workstation.png
+nagios/images/logos/workstation_locked.png
+nagios/images/logos/yellowdog.gd2
+nagios/images/logos/yellowdog.gif
+nagios/images/logos/yellowdog.jpg
+nagios/images/logos/yellowdog.png
 nagios/images/logrotate.png
 nagios/images/ndisabled.gif
 nagios/images/noack.gif
@@ -338,6 +333,13 @@ nagios/images/weblogo1.png
 nagios/images/zoom1.gif
 nagios/images/zoom2.gif
 nagios/includes/
+nagios/includes/rss/
+nagios/includes/rss/extlib/
+nagios/includes/rss/extlib/Snoopy.class.inc
+nagios/includes/rss/rss_cache.inc
+nagios/includes/rss/rss_fetch.inc
+nagios/includes/rss/rss_parse.inc
+nagios/includes/rss/rss_utils.inc
 nagios/includes/utils.inc.php
 nagios/index.php
 nagios/main.php