diff --git a/data/fields/roof/height.json b/data/fields/roof/height.json
new file mode 100644
index 000000000..6453b46c8
--- /dev/null
+++ b/data/fields/roof/height.json
@@ -0,0 +1,6 @@
+{
+    "key": "roof:height",
+    "minValue": 0,
+    "type": "number",
+    "label": "Roof Height (Meters)"
+}
diff --git a/data/fields/roof/shape.json b/data/fields/roof/shape.json
new file mode 100644
index 000000000..769836a92
--- /dev/null
+++ b/data/fields/roof/shape.json
@@ -0,0 +1,23 @@
+{
+    "key": "roof:shape",
+    "type": "combo",
+    "label": "Roof Shape",
+    "strings": {
+        "options": {
+            "flat": "Flat",
+            "gabled": "Gabled",
+            "skillion": "Skillion",
+            "hipped": "Hipped",
+            "half-hipped": "Half-Hipped",
+            "mansard": "Mansard",
+            "gambrel": "Gambrel",
+            "pyramidal": "Pyramidal",
+            "cone": "Cone",
+            "dome": "Dome",
+            "onion": "Onion",
+            "round": "Round"
+        }
+    },
+    "autoSuggestions": true,
+    "customValues": false
+}
diff --git a/data/presets/building.json b/data/presets/building.json
index e17f61345..391d2eb8f 100644
--- a/data/presets/building.json
+++ b/data/presets/building.json
@@ -19,6 +19,8 @@
         "not/name",
         "operator",
         "roof/colour",
+        "roof/shape",
+        "roof/height",
         "smoking",
         "wheelchair"
     ],
diff --git a/data/presets/building/roof.json b/data/presets/building/roof.json
index 75a94a111..f407dfbf4 100644
--- a/data/presets/building/roof.json
+++ b/data/presets/building/roof.json
@@ -17,7 +17,9 @@
         "gnis/feature_id-US",
         "not/name",
         "operator",
-        "roof/colour"
+        "roof/colour",
+        "roof/shape",
+        "roof/height"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/building_part.json b/data/presets/building_part.json
index e49629113..b734d16fb 100644
--- a/data/presets/building_part.json
+++ b/data/presets/building_part.json
@@ -6,7 +6,9 @@
         "height",
         "building/material",
         "building/colour",
-        "roof/colour"
+        "roof/colour",
+        "roof/height",
+        "roof/shape"
     ],
     "moreFields": [
         "layer"