diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm
index aa2e990e0..ef1e9bcd8 100644
--- a/lib/Slic3r/Print.pm
+++ b/lib/Slic3r/Print.pm
@@ -443,7 +443,7 @@ sub export_gcode {
         or die "Failed to open $file for writing\n";
     
     # write start commands to file
-    printf $fh "M104 S%d ; set temperature\n", $Slic3r::temperature;
+    printf $fh "M104 S%d ; set temperature\n", $Slic3r::temperature unless $Slic3r::temperature;
     print  $fh "$Slic3r::start_gcode\n";
     print  $fh "G90 ; use absolute coordinates\n";
     print  $fh "G21 ; set units to millimeters\n";
diff --git a/slic3r.pl b/slic3r.pl
index bd6abec29..f4b7f173a 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -147,7 +147,7 @@ Usage: slic3r.pl [ OPTIONS ] file.stl
     --filament-packing-density
                         Ratio of the extruded volume over volume pushed 
                         into the extruder (default: $Slic3r::filament_packing_density)
-    --temperature       Extrusion temperature (default: $Slic3r::temperature)
+    --temperature       Extrusion temperature, set 0 to disable (default: $Slic3r::temperature)
     
   Speed options:
     --print-feed-rate   Speed of print moves in mm/sec (default: $Slic3r::print_feed_rate)