diff --git a/features/set.yml b/features/set.yml
index b903de6d545..7e18d54a61b 100644
--- a/features/set.yml
+++ b/features/set.yml
@@ -5,3 +5,20 @@ snapshot: ecmascript-2015
 group: sets
 status:
   compute_from: javascript.builtins.Set.Set
+compat_features:
+  - javascript.builtins.Set
+  - javascript.builtins.Set.Set
+  - javascript.builtins.Set.add
+  - javascript.builtins.Set.delete
+  - javascript.builtins.Set.has
+  - javascript.builtins.Set.clear
+  - javascript.builtins.Set.size
+  - javascript.builtins.Set.entries
+  - javascript.builtins.Set.keys
+  - javascript.builtins.Set.values
+  - javascript.builtins.Set.forEach
+  - javascript.builtins.Set.Set.iterable_allowed
+  - javascript.builtins.Set.key_equality_for_zeros
+  - javascript.builtins.Set.Set.null_allowed
+  - javascript.builtins.Set.@@iterator
+  - javascript.builtins.Set.@@species
diff --git a/features/set.yml.dist b/features/set.yml.dist
index cb793183dfb..b21b0151c59 100644
--- a/features/set.yml.dist
+++ b/features/set.yml.dist
@@ -125,3 +125,16 @@ compat_features:
   #   safari: "9"
   #   safari_ios: "9"
   - javascript.builtins.Set.@@iterator
+
+  # baseline: high
+  # baseline_low_date: 2016-09-20
+  # baseline_high_date: 2019-03-20
+  # support:
+  #   chrome: "51"
+  #   chrome_android: "51"
+  #   edge: "13"
+  #   firefox: "41"
+  #   firefox_android: "41"
+  #   safari: "10"
+  #   safari_ios: "10"
+  - javascript.builtins.Set.@@species