diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php
index 49145dcfc..1c12f7e39 100644
--- a/includes/rrdtool.inc.php
+++ b/includes/rrdtool.inc.php
@@ -206,7 +206,7 @@ function rrdtool($command, $filename, $options) {
 
 
 function rrdtool_create($filename, $options) {
-    return rrdtool('create', $filename, $options);
+    return rrdtool('create', $filename,  str_replace(array("\r", "\n"), '', $options));
 }