Index: /lm-sensors/branches/lm-sensors-3.0.0/INSTALL
===================================================================
--- /lm-sensors/branches/lm-sensors-3.0.0/INSTALL	(revision 5067)
+++ /lm-sensors/branches/lm-sensors-3.0.0/INSTALL	(revision 5072)
@@ -19,5 +19,5 @@
 Run-time dependencies:
 * perl (for sensors-detect)
-* rrd (optional, for sensord)
+* rrdtool >= 1.2.1 (optional, for sensord)
 * proper kernel configuration (see below)
 
Index: /lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c
===================================================================
--- /lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c	(revision 5071)
+++ /lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c	(revision 5072)
@@ -41,5 +41,4 @@
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <rrd.h>
 
@@ -252,8 +251,4 @@
         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 ());
@@ -418,8 +413,4 @@
       "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 ());
Index: /lm-sensors/branches/lm-sensors-3.0.0/CHANGES
===================================================================
--- /lm-sensors/branches/lm-sensors-3.0.0/CHANGES	(revision 5070)
+++ /lm-sensors/branches/lm-sensors-3.0.0/CHANGES	(revision 5072)
@@ -11,4 +11,5 @@
   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