diff --git a/html/pages/settings/external.inc.php b/html/pages/settings/external.inc.php
index b5b4661cd..a912ce403 100644
--- a/html/pages/settings/external.inc.php
+++ b/html/pages/settings/external.inc.php
@@ -39,7 +39,7 @@ $rrdtool_conf = array(
            'descr'             => 'Path to rrdtool binary',
            'type'              => 'text',
     ),
-    array('name'               => 'rrdtool.tune',
+    array('name'               => 'rrdtool_tune',
           'descr'              => 'Tune all rrd port files to use max values',
           'type'               => 'checkbox',
     ),
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index d0301bff5..640dcd05b 100644
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -339,7 +339,7 @@ foreach ($ports as $port) {
                 $device_tune = get_dev_attrib($device,'override_rrdtool_tune');
                 if ($port_tune == "true" ||
                     ($device_tune == "true" && $port_tune != 'false') || 
-                    ($config['rrdtool']['tune'] == "true" && $port_tune != 'false' && $device_tune != 'false')) {
+                    ($config['rrdtool_tune'] == "true" && $port_tune != 'false' && $device_tune != 'false')) {
                     if ($oid == 'ifSpeed') {
                         $tune_port = true;
                     }
@@ -487,6 +487,7 @@ foreach ($ports as $port) {
             'OUTMULTICASTPKTS' => $this_port['ifOutMulticastPkts'],
         );
 
+	echo "TEST $tune_port END \n";
         if ($tune_port === true) {
             rrdtool_tune('port',$rrdfile,$this_port['ifSpeed']);
         }
diff --git a/scripts/tune_port.php b/scripts/tune_port.php
index 061817283..c38f41dd0 100755
--- a/scripts/tune_port.php
+++ b/scripts/tune_port.php
@@ -19,9 +19,6 @@ if (empty($hosts) && empty($ports)) {
 
 }
 
-echo "TEST $hosts and $ports\n";
-$debug=1;
-
 foreach (dbFetchRows("SELECT `device_id`,`hostname` FROM `devices` WHERE `hostname` LIKE ?", array('%'.$hosts.'%')) as $device) {
     echo "Found hostname " . $device['hostname'].".......\n";
     foreach (dbFetchRows("SELECT `ifIndex`,`ifName`,`ifSpeed` FROM `ports` WHERE `ifName` LIKE ? AND `device_id` = ?", array('%'.$ports.'%',$device['device_id'])) as $port) {
diff --git a/sql-schema/077.sql b/sql-schema/077.sql
index 30bbf95fb..b4106e952 100644
--- a/sql-schema/077.sql
+++ b/sql-schema/077.sql
@@ -1 +1 @@
-INSERT INTO config (config_name,config_value,config_default,config_descr,config_group,config_group_order,config_sub_group,config_sub_group_order,config_hidden,config_disabled) values ('rrdtool','/usr/bin/rrdtool','/usr/bin/rrdtool','Path to rrdtool','external',0,'rrdtool',0,'0','0'), ('rrdtool.tune','false','false','Auto tune maximum value for rrd port files','external',0,'rrdtool',0,'0','0');
+INSERT INTO config (config_name,config_value,config_default,config_descr,config_group,config_group_order,config_sub_group,config_sub_group_order,config_hidden,config_disabled) values ('rrdtool','/usr/bin/rrdtool','/usr/bin/rrdtool','Path to rrdtool','external',0,'rrdtool',0,'0','0'), ('rrdtool_tune','false','false','Auto tune maximum value for rrd port files','external',0,'rrdtool',0,'0','0');