diff --git a/README.markdown b/README.markdown
index 7a9553340..67a4e7d0a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -144,6 +144,8 @@ The author of the Silk icon set is Mark James.
                             (default: 60)
         --top-solid-infill-speed Speed of print moves for top surfaces in mm/s or % over solid infill speed
                             (default: 50)
+        --support-material-speed
+                            Speed of support material print moves in mm/s (default: 60)
         --bridge-speed      Speed of bridge print moves in mm/s (default: 60)
         --gap-fill-speed    Speed of gap fill print moves in mm/s (default: 20)
         --first-layer-speed Speed of print moves for bottom layer, expressed either as an absolute
diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index 6ef3d8ca6..85b1c0149 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -284,6 +284,14 @@ our $Options = {
         ratio_over => 'solid_infill_speed',
         default => 50,
     },
+    'support_material_speed' => {
+        label   => 'Support material',
+        tooltip => 'Speed for printing support material.',
+        sidetext => 'mm/s',
+        cli     => 'support-material-speed=f',
+        type    => 'f',
+        default => 60,
+    },
     'bridge_speed' => {
         label   => 'Bridges',
         tooltip => 'Speed for printing bridges.',
diff --git a/lib/Slic3r/GCode.pm b/lib/Slic3r/GCode.pm
index 5cb86e56a..bc5c32905 100644
--- a/lib/Slic3r/GCode.pm
+++ b/lib/Slic3r/GCode.pm
@@ -36,7 +36,7 @@ has 'speeds' => (
     default => sub {+{
         map { $_ => 60 * $Slic3r::Config->get_value("${_}_speed") }
             qw(travel perimeter small_perimeter external_perimeter infill
-                solid_infill top_solid_infill bridge gap_fill),
+                solid_infill top_solid_infill support_material bridge),
     }},
 );
 
@@ -51,8 +51,8 @@ my %role_speeds = (
     &EXTR_ROLE_TOPSOLIDFILL                 => 'top_solid_infill',
     &EXTR_ROLE_BRIDGE                       => 'bridge',
     &EXTR_ROLE_SKIRT                        => 'perimeter',
-    &EXTR_ROLE_SUPPORTMATERIAL              => 'perimeter',
-    &EXTR_ROLE_GAPFILL                      => 'gap_fill',
+    &EXTR_ROLE_SUPPORTMATERIAL              => 'support_material',
+    &EXTR_ROLE_GAPFILL                      => 'solid_infill',
 );
 
 sub set_shift {
diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm
index 31e2e103b..bc215a049 100644
--- a/lib/Slic3r/GUI/Tab.pm
+++ b/lib/Slic3r/GUI/Tab.pm
@@ -420,7 +420,7 @@ sub build {
     $self->add_options_page('Speed', 'time.png', optgroups => [
         {
             title => 'Speed for print moves',
-            options => [qw(perimeter_speed small_perimeter_speed external_perimeter_speed infill_speed solid_infill_speed top_solid_infill_speed bridge_speed gap_fill_speed)],
+            options => [qw(perimeter_speed small_perimeter_speed external_perimeter_speed infill_speed solid_infill_speed top_solid_infill_speed support_material_speed bridge_speed gap_fill_speed)],
         },
         {
             title => 'Speed for non-print moves',
diff --git a/slic3r.pl b/slic3r.pl
index 6f0938241..98f4aef1c 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -192,6 +192,8 @@ $j
                         (default: $config->{solid_infill_speed})
     --top-solid-infill-speed Speed of print moves for top surfaces in mm/s or % over solid infill speed
                         (default: $config->{top_solid_infill_speed})
+    --support-material-speed
+                        Speed of support material print moves in mm/s (default: $config->{support_material_speed})
     --bridge-speed      Speed of bridge print moves in mm/s (default: $config->{bridge_speed})
     --gap-fill-speed    Speed of gap fill print moves in mm/s (default: $config->{gap_fill_speed})
     --first-layer-speed Speed of print moves for bottom layer, expressed either as an absolute