diff --git a/fhem/webfrontend/pgm2/01_FHEMWEB.pm b/fhem/webfrontend/pgm2/01_FHEMWEB.pm
index a336e69c5..485fed74b 100755
--- a/fhem/webfrontend/pgm2/01_FHEMWEB.pm
+++ b/fhem/webfrontend/pgm2/01_FHEMWEB.pm
@@ -835,6 +835,7 @@ FW_readgplotfile($$$)
   my (@filelog, @data, $plot);
   open(FH, $gplot_pgm) || return (FW_fatal("$gplot_pgm: $!"), undef);
   while(my $l = <FH>) {
+    $l =~ s/\r//g;
     if($l =~ m/^#FileLog (.*)$/) {
       push(@filelog, $1);
     } elsif($l =~ "^plot" || $plot) {
@@ -888,6 +889,9 @@ FW_substcfg($$$$$$)
     }
   }
 
+  $plot =~ s/\r//g;             # For our windows friends...
+  $gplot_script =~ s/\r//g;
+
   if($splitret == 1) {
     my @ret = split("\n", $gplot_script); 
     return (\@ret, $plot);