--- contrib/collection.cgi.orig	2010-04-22 11:30:07.000000000 +0200
+++ contrib/collection.cgi	2010-05-20 18:23:38.000000000 +0200
@@ -11,7 +11,7 @@
 use RRDs ();
 use Data::Dumper ();
 
-our $Config = "/etc/collection.conf";
+our $Config = "/etc/collectd/collection.conf";
 our @DataDirs = ();
 our @DontShowTypes = ();
 our $LibDir;
--- contrib/collection.conf.orig	2010-04-22 11:29:35.000000000 +0200
+++ contrib/collection.conf	2010-05-20 18:23:38.000000000 +0200
@@ -1,3 +1,2 @@
-datadir: "/opt/collectd/var/lib/collectd/rrd/"
-libdir: "/opt/collectd/lib/collectd/"
-
+datadir: "/var/lib/collectd/"
+libdir: "@@LIBDIR@@/collectd/"