diff --git a/package/rrdcollect/files/rrd.conf b/package/rrdcollect/files/rrd.conf
index d47b71a2a..4ee13ce94 100644
--- a/package/rrdcollect/files/rrd.conf
+++ b/package/rrdcollect/files/rrd.conf
@@ -16,7 +16,7 @@ RRDTOOL=/usr/bin/rrdtool
 # Location of rrdcgi
 RRDCGI=/usr/bin/rrdcgi
 # Location of generated cgi-script
-RRDCGISCRIPT=$DATA/rrd.cgi
+RRDCGISCRIPT=$DATADIR/rrd.cgi
 # Image-Path relative to webserver-root
 RRDCGIIMGPATH="/img"
 # Location of netcat (used for fetching data from rrdcollect-daemon)
diff --git a/package/rrdcollect/files/rrdcollect.init b/package/rrdcollect/files/rrdcollect.init
index a6089ba16..7bcd1e933 100644
--- a/package/rrdcollect/files/rrdcollect.init
+++ b/package/rrdcollect/files/rrdcollect.init
@@ -17,7 +17,7 @@ case $1 in
   mkdir -p $IMG_D
   mkdir -p $RRD_D
   [ -x $CGI_S ] || /usr/bin/rrd.sh cgi
-  [ -n "$RRD_D" ] || /usr/bin/rrd.sh init
+  [ -n "$RRD_F" ] || /usr/bin/rrd.sh init
   $BIN $OPTIONS
   ;;
  stop)