diff --git a/features/margin.yml b/features/margin.yml
new file mode 100644
index 00000000000..9e59861826b
--- /dev/null
+++ b/features/margin.yml
@@ -0,0 +1,15 @@
+name: margin
+description: The `margin` CSS property sets space around an element. It is a shorthand for `margin-top`, `margin-right`, `margin-bottom`, and `margin-left`.
+spec: https://drafts.csswg.org/css-box-4/#margins
+group: layout
+compat_features:
+  - css.properties.margin
+  - css.properties.margin.auto
+  - css.properties.margin-bottom
+  - css.properties.margin-bottom.auto
+  - css.properties.margin-left
+  - css.properties.margin-left.auto
+  - css.properties.margin-right
+  - css.properties.margin-right.auto
+  - css.properties.margin-top
+  - css.properties.margin-top.auto
diff --git a/features/margin.yml.dist b/features/margin.yml.dist
new file mode 100644
index 00000000000..a732c0a5017
--- /dev/null
+++ b/features/margin.yml.dist
@@ -0,0 +1,26 @@
+# Generated from: margin.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: high
+  baseline_low_date: 2015-07-29
+  baseline_high_date: 2018-01-29
+  support:
+    chrome: "1"
+    chrome_android: "18"
+    edge: "12"
+    firefox: "1"
+    firefox_android: "4"
+    safari: "1"
+    safari_ios: "1"
+compat_features:
+  - css.properties.margin
+  - css.properties.margin-bottom
+  - css.properties.margin-bottom.auto
+  - css.properties.margin-left
+  - css.properties.margin-left.auto
+  - css.properties.margin-right
+  - css.properties.margin-right.auto
+  - css.properties.margin-top
+  - css.properties.margin-top.auto
+  - css.properties.margin.auto
diff --git a/features/padding.yml b/features/padding.yml
new file mode 100644
index 00000000000..dbcaf331562
--- /dev/null
+++ b/features/padding.yml
@@ -0,0 +1,10 @@
+name: padding
+description: The `padding` CSS property sets space between an element's edge and its contents. It is a shorthand for `padding-top`, `padding-right`, `padding-bottom`, and `padding-left`.
+spec: https://drafts.csswg.org/css-box-4/#paddings
+group: layout
+compat_features:
+  - css.properties.padding
+  - css.properties.padding-bottom
+  - css.properties.padding-left
+  - css.properties.padding-right
+  - css.properties.padding-top
diff --git a/features/padding.yml.dist b/features/padding.yml.dist
new file mode 100644
index 00000000000..1486cfb840a
--- /dev/null
+++ b/features/padding.yml.dist
@@ -0,0 +1,21 @@
+# Generated from: padding.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: high
+  baseline_low_date: 2015-07-29
+  baseline_high_date: 2018-01-29
+  support:
+    chrome: "1"
+    chrome_android: "18"
+    edge: "12"
+    firefox: "1"
+    firefox_android: "4"
+    safari: "1"
+    safari_ios: "1"
+compat_features:
+  - css.properties.padding
+  - css.properties.padding-bottom
+  - css.properties.padding-left
+  - css.properties.padding-right
+  - css.properties.padding-top