diff -ruN nagios-2.0b1.orig/include/locations.h.in nagios-2.0b1/include/locations.h.in
--- nagios-2.0b1.orig/include/locations.h.in	2005-01-07 19:41:04 +1000
+++ nagios-2.0b1/include/locations.h.in	2005-01-07 19:42:13 +1000
@@ -19,22 +19,22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  ************************************************************************/
 
-#define DEFAULT_TEMP_FILE			"@localstatedir@/tempfile"
-#define DEFAULT_STATUS_FILE			"@localstatedir@/status.dat"
-#define DEFAULT_LOG_FILE			"@localstatedir@/nagios.log"
-#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
-#define DEFAULT_COMMENT_FILE			"@localstatedir@/comments.dat"
-#define DEFAULT_DOWNTIME_FILE			"@localstatedir@/downtime.dat"
-#define DEFAULT_RETENTION_FILE			"@localstatedir@/retention.dat"
-#define DEFAULT_COMMAND_FILE			"@localstatedir@/rw/nagios.cmd"
-#define DEFAULT_CONFIG_FILE			"@sysconfdir@/nagios.cfg"
+#define DEFAULT_TEMP_FILE			"@localstatedir@/nagios/tempfile"
+#define DEFAULT_STATUS_FILE			"@localstatedir@/nagios/status.dat"
+#define DEFAULT_LOG_FILE			"@localstatedir@/nagios/nagios.log"
+#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/nagios/archives/"
+#define DEFAULT_COMMENT_FILE			"@localstatedir@/nagios/comments.dat"
+#define DEFAULT_DOWNTIME_FILE			"@localstatedir@/nagios/downtime.dat"
+#define DEFAULT_RETENTION_FILE			"@localstatedir@/nagios/retention.dat"
+#define DEFAULT_COMMAND_FILE			"@localstatedir@/nagios/rw/nagios.cmd"
+#define DEFAULT_CONFIG_FILE			"@sysconfdir@/nagios/nagios.cfg"
 #define DEFAULT_PHYSICAL_HTML_PATH		"@datadir@"
 #define DEFAULT_URL_HTML_PATH			"@htmurl@"
 #define DEFAULT_PHYSICAL_CGIBIN_PATH		"@sbindir@"
 #define DEFAULT_URL_CGIBIN_PATH			"@cgiurl@"
-#define DEFAULT_CGI_CONFIG_FILE			"@sysconfdir@/cgi.cfg"
+#define DEFAULT_CGI_CONFIG_FILE			"@sysconfdir@/nagios/cgi.cfg"
 #define DEFAULT_LOCK_FILE			"@lockfile@"
-#define DEFAULT_OBJECT_CACHE_FILE		"@localstatedir@/objects.cache"
-#define DEFAULT_EVENT_BROKER_FILE		"@localstatedir@/broker.socket"
+#define DEFAULT_OBJECT_CACHE_FILE		"@localstatedir@/nagios/objects.cache"
+#define DEFAULT_EVENT_BROKER_FILE		"@localstatedir@/nagios/broker.socket"
 #define DEFAULT_P1_FILE				"@libdir@/nagios/p1.pl"	/**** EMBEDDED PERL ****/
 #define DEFAULT_AUTH_FILE			""			/**** EMBEDDED PERL - IS THIS USED? ****/