diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs
index acfa1e72c27c2..6d815dc17de03 100644
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -3913,11 +3913,6 @@ kerning
 "
 font
 -
-stretch
-"
-"
-font
--
 variant
 "
 ]
@@ -6337,6 +6332,9 @@ font
 family
 font
 -
+stretch
+font
+-
 style
 font
 -
@@ -6840,6 +6838,171 @@ mSize
 }
 pub
 fn
+set_font_stretch
+(
+&
+mut
+self
+v
+:
+longhands
+:
+:
+font_stretch
+:
+:
+computed_value
+:
+:
+T
+)
+{
+use
+computed_values
+:
+:
+font_stretch
+:
+:
+T
+;
+self
+.
+gecko
+.
+mFont
+.
+stretch
+=
+match
+v
+{
+T
+:
+:
+normal
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_NORMAL
+as
+i16
+T
+:
+:
+ultra_condensed
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_ULTRA_CONDENSED
+as
+i16
+T
+:
+:
+extra_condensed
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_EXTRA_CONDENSED
+as
+i16
+T
+:
+:
+condensed
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_CONDENSED
+as
+i16
+T
+:
+:
+semi_condensed
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_SEMI_CONDENSED
+as
+i16
+T
+:
+:
+semi_expanded
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_SEMI_EXPANDED
+as
+i16
+T
+:
+:
+expanded
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_EXPANDED
+as
+i16
+T
+:
+:
+extra_expanded
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_EXTRA_EXPANDED
+as
+i16
+T
+:
+:
+ultra_expanded
+=
+>
+structs
+:
+:
+NS_FONT_STRETCH_ULTRA_EXPANDED
+as
+i16
+}
+;
+}
+{
+impl_simple_copy
+(
+'
+font_stretch
+'
+'
+mFont
+.
+stretch
+'
+)
+}
+pub
+fn
 set_font_weight
 (
 &