diff --git a/CHANGES b/CHANGES
index 98c107af..b36cf370 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ SVN
              Warn about outputs found in automatic mode
   sensord: Fix rrd support (#2276)
            Use the same colors for daily and weekly charts
+           Drop workaround needed by old versions of rrdtool
   sensors-detect: Drop PCA9540 detection
 
 3.0.0 (2007-11-24)
diff --git a/INSTALL b/INSTALL
index 1eb3f59d..f4dc82f2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,7 @@ Build-time dependencies:
 
 Run-time dependencies:
 * perl (for sensors-detect)
-* rrd (optional, for sensord)
+* rrdtool >= 1.2.1 (optional, for sensord)
 * proper kernel configuration (see below)
 
 
diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
index a6021f51..1afee522 100644
--- a/prog/sensord/rrd.c
+++ b/prog/sensord/rrd.c
@@ -40,7 +40,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <rrd.h>
 
 #include "sensord.h"
@@ -251,10 +250,6 @@ rrdInit
         argc += num;
         argv[argc ++] = rraBuff;
         argv[argc] = NULL;
-        optind = 1;
-        opterr = 0;
-        optopt = '?';
-        optarg = NULL;
         if ((ret = rrd_create (argc, (char **) /* WEAK */ argv))) {
           sensorLog (LOG_ERR, "Error creating RRD file: %s: %s", rrdFile, rrd_get_error ());
         }
@@ -417,10 +412,6 @@ rrdUpdate
     const char *argv[] = {
       "sensord", rrdFile, rrdBuff, NULL
     };
-    optind = 1;
-    opterr = 0;
-    optopt = '?';
-    optarg = NULL;
     if ((ret = rrd_update (3, (char **) /* WEAK */ argv))) {
       sensorLog (LOG_ERR, "Error updating RRD file: %s: %s", rrdFile, rrd_get_error ());
     }