diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm
index 409609d48..706ec8d44 100644
--- a/lib/Slic3r/GCode.pm
+++ b/lib/Slic3r/GCode.pm
@@ -419,6 +419,8 @@ sub retract {
     # this makes sure we leave sufficient precision in the firmware
     $gcode .= $self->reset_e;
     
+    $gcode .= "M103 ; extruder off\n" if $self->config->gcode_flavor eq 'makerbot';
+    
     return $gcode;
 }
 
@@ -426,6 +428,7 @@ sub unretract {
     my $self = shift;
     
     my $gcode = "";
+    $gcode .= "M101 ; extruder on\n" if $self->config->gcode_flavor eq 'makerbot';
     
     if ($self->lifted) {
         $self->speed('travel');