diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index e2739c421..bc0455889 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -243,7 +243,7 @@ sub validate {
         if !first { $_ eq $self->gcode_flavor } @{$Options->{gcode_flavor}{values}};
     
     die "--use-firmware-retraction is only supported by Marlin firmware\n"
-        if $self->use_firmware_retraction && $self->gcode_flavor ne 'reprap';
+        if $self->use_firmware_retraction && $self->gcode_flavor ne 'reprap' && $self->gcode_flavor ne 'machinekit';
     
     die "--use-firmware-retraction is not compatible with --wipe\n"
         if $self->use_firmware_retraction && first {$_} @{$self->wipe};