--- src/collectd.conf.in.orig	2010-07-09 12:01:59.000000000 +0200
+++ src/collectd.conf.in	2010-07-12 01:05:24.000000000 +0200
@@ -12,10 +12,10 @@
 
 #Hostname    "localhost"
 FQDNLookup   true
-#BaseDir     "@prefix@/var/lib/@PACKAGE_NAME@"
-#PIDFile     "@prefix@/var/run/@PACKAGE_NAME@.pid"
-#PluginDir   "@prefix@/lib/@PACKAGE_NAME@"
-#TypesDB     "@prefix@/share/@PACKAGE_NAME@/types.db"
+#BaseDir     "/var/lib/@PACKAGE_NAME@"
+#PIDFile     "/var/run/@PACKAGE_NAME@.pid"
+#PluginDir   "@libdir@/@PACKAGE_NAME@"
+#TypesDB     "@libdir@/@PACKAGE_NAME@/types.db"
 #Interval     10
 #Timeout      2
 #ReadThreads  5
@@ -149,7 +149,7 @@
 
 #<Plugin apache>
 #	URL "http://localhost/status?auto"
-#	User "www-user"
+#	User "www"
 #	Password "secret"
 #	CACert "/etc/ssl/ca.crt"
 #</Plugin>
@@ -161,7 +161,7 @@
 
 #<Plugin ascent>
 #	URL "http://localhost/ascent/status/"
-#	User "www-user"
+#	User "www"
 #	Password "secret"
 #	CACert "/etc/ssl/ca.crt"
 #</Plugin>
@@ -186,7 +186,7 @@
 #</Plugin>
 
 #<Plugin csv>
-#	DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+#	DataDir "/var/lib/@PACKAGE_NAME@/csv"
 #	StoreRates false
 #</Plugin>
 
@@ -299,7 +299,7 @@
 #</Plugin>
 
 #<Plugin email>
-#	SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email"
+#	SocketFile "/var/run/@PACKAGE_NAME@-email"
 #	SocketGroup "collectd"
 #	SocketPerms "0770"
 #	MaxConns 5
@@ -881,7 +881,7 @@
 #</Plugin>
 
 #<Plugin unixsock>
-#	SocketFile "@prefix@/var/run/@PACKAGE_NAME@-unixsock"
+#	SocketFile "/var/run/@PACKAGE_NAME@-unixsock"
 #	SocketGroup "collectd"
 #	SocketPerms "0660"
 #</Plugin>