diff -ur collectd-4.8.0.orig/Makefile.am collectd-4.8.0/Makefile.am
--- collectd-4.8.0.orig/Makefile.am	2009-09-13 12:38:18.000000000 +0200
+++ collectd-4.8.0/Makefile.am	2009-09-15 22:34:01.000000000 +0200
@@ -7,6 +7,6 @@
 EXTRA_DIST = contrib version-gen.sh
 
 install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
+	$(mkinstalldirs) $(DESTDIR)/var/run/$(PACKAGE_NAME)
+	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/$(PACKAGE_NAME)
+	$(mkinstalldirs) $(DESTDIR)/var/log/$(PACKAGE_NAME)
diff -ur collectd-4.8.0.orig/src/Makefile.am collectd-4.8.0/src/Makefile.am
--- collectd-4.8.0.orig/src/Makefile.am	2009-09-13 17:21:43.000000000 +0200
+++ collectd-4.8.0/src/Makefile.am	2009-09-15 22:34:01.000000000 +0200
@@ -13,9 +13,9 @@
 AM_CPPFLAGS = -DPREFIX='"${prefix}"'
 AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
 AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
-AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
+AM_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/${PACKAGE_NAME}"'
 if BUILD_FEATURE_DAEMON
-AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
+AM_CPPFLAGS += -DPIDFILE='"/var/run/${PACKAGE_NAME}/${PACKAGE_NAME}.pid"'
 endif
 AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
 AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
diff -ur collectd-4.8.0.orig/src/collectd.conf.in collectd-4.8.0/src/collectd.conf.in
--- collectd-4.8.0.orig/src/collectd.conf.in	2009-09-13 17:21:43.000000000 +0200
+++ collectd-4.8.0/src/collectd.conf.in	2009-09-15 22:37:45.000000000 +0200
@@ -12,9 +12,9 @@
 
 #Hostname    "localhost"
 FQDNLookup   true
-#BaseDir     "@prefix@/var/lib/@PACKAGE_NAME@"
-#PIDFile     "@prefix@/var/run/@PACKAGE_NAME@.pid"
-#PluginDir   "@prefix@/lib/@PACKAGE_NAME@"
+#BaseDir     "@localstatedir@/@PACKAGE_NAME@"
+#PIDFile     "/var/run/@PACKAGE_NAME@.pid"
+#PluginDir   "@libdir@/@PACKAGE_NAME@"
 #TypesDB     "@prefix@/share/@PACKAGE_NAME@/types.db"
 #Interval     10
 #ReadThreads  5
@@ -208,7 +208,7 @@
 #</Plugin>
 
 #<Plugin csv>
-#	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+#	DataDir "@localstatedir@/@PACKAGE_NAME@/csv"
 #	StoreRates false
 #</Plugin>
 
@@ -267,7 +267,7 @@
 #</Plugin>
 
 #<Plugin email>
-#	SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email"
+#	SocketFile "@localstatedir@/@PACKAGE_NAME@/@PACKAGE_NAME@-email"
 #	SocketGroup "collectd"
 #	SocketPerms "0770"
 #	MaxConns 5
@@ -582,7 +582,7 @@
 #</Plugin>
 
 #<Plugin rrdtool>
-#	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
+#	DataDir "@localstatedir@/@PACKAGE_NAME@/rrd"
 #	CacheTimeout 120
 #	CacheFlush   900
 #</Plugin>
@@ -702,7 +702,7 @@
 #</Plugin>
 
 #<Plugin unixsock>
-#	SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock"
+#	SocketFile "@localstatedir@/@PACKAGE_NAME@/@PACKAGE_NAME@-unixsock"
 #	SocketGroup "collectd"
 #	SocketPerms "0660"
 #</Plugin>
diff -ur collectd-4.8.0.orig/src/collectd.h collectd-4.8.0/src/collectd.h
--- collectd-4.8.0.orig/src/collectd.h	2009-09-13 12:38:18.000000000 +0200
+++ collectd-4.8.0/src/collectd.h	2009-09-15 22:34:01.000000000 +0200
@@ -230,11 +230,11 @@
 #endif
 
 #ifndef PREFIX
-#define PREFIX "/opt/" PACKAGE_NAME
+#define PREFIX "/usr/" PACKAGE_NAME
 #endif
 
 #ifndef SYSCONFDIR
-#define SYSCONFDIR PREFIX "/etc"
+#define SYSCONFDIR "/etc"
 #endif
 
 #ifndef CONFIGFILE
@@ -242,15 +242,15 @@
 #endif
 
 #ifndef LOCALSTATEDIR
-#define LOCALSTATEDIR PREFIX "/var"
+#define LOCALSTATEDIR "/var/lib"
 #endif
 
 #ifndef PKGLOCALSTATEDIR
-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
+#define PKGLOCALSTATEDIR "/var/lib/" PACKAGE_NAME
 #endif
 
 #ifndef PIDFILE
-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
+#define PIDFILE "/var/run/" PACKAGE_NAME "/" PACKAGE_NAME ".pid"
 #endif
 
 #ifndef PLUGINDIR
diff -ur collectd-4.8.0.orig/src/collectdmon.c collectd-4.8.0/src/collectdmon.c
--- collectd-4.8.0.orig/src/collectdmon.c	2009-09-13 12:38:18.000000000 +0200
+++ collectd-4.8.0/src/collectdmon.c	2009-09-15 22:34:01.000000000 +0200
@@ -51,7 +51,7 @@
 #include <unistd.h>
 
 #ifndef COLLECTDMON_PIDFILE
-# define COLLECTDMON_PIDFILE LOCALSTATEDIR"/run/collectdmon.pid"
+# define COLLECTDMON_PIDFILE "/var/run/collectd/collectdmon.pid"
 #endif /* ! COLLECTDMON_PIDFILE */
 
 #ifndef WCOREDUMP
diff -ur collectd-4.8.0.orig/src/logfile.c collectd-4.8.0/src/logfile.c
--- collectd-4.8.0.orig/src/logfile.c	2009-09-13 12:38:18.000000000 +0200
+++ collectd-4.8.0/src/logfile.c	2009-09-15 22:34:01.000000000 +0200
@@ -27,7 +27,7 @@
 
 #include <pthread.h>
 
-#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
+#define DEFAULT_LOGFILE "/var/log/collectd/collectd.log"
 
 #if COLLECT_DEBUG
 static int log_level = LOG_DEBUG;