diff --git a/data/deprecated.json b/data/deprecated.json
index d853f116..4003709a 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -2103,5 +2103,13 @@
   {
      "old": {"cycleway:left": "opposite"},
      "replace": {"oneway:bicycle": "no", "cycleway:left": "no"}
+  },
+  {
+    "old": {"man_made": "torii"},
+    "replace": {"man_made": "ceremonial_gate", "ceremonial_gate": "torii"}
+  },
+  {
+    "old": {"man_made": "paifang"},
+    "replace": {"man_made": "ceremonial_gate", "ceremonial_gate": "paifang"}
   }
 ]
diff --git a/data/fields/ceremonial_gate.json b/data/fields/ceremonial_gate.json
new file mode 100644
index 00000000..24373110
--- /dev/null
+++ b/data/fields/ceremonial_gate.json
@@ -0,0 +1,13 @@
+{
+    "key": "ceremonial_gate",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "torii": "Torii",
+            "paifang": "Paifang",
+            "hongsalmun": "Hongsalmun",
+            "iljumun": "Iljumun"
+        }
+    }
+}
diff --git a/data/presets/man_made/ceremonial_gate.json b/data/presets/man_made/ceremonial_gate.json
new file mode 100644
index 00000000..3c13ee38
--- /dev/null
+++ b/data/presets/man_made/ceremonial_gate.json
@@ -0,0 +1,33 @@
+{
+    "icon": "fas-archway",
+    "fields": [
+        "ceremonial_gate",
+        "height",
+        "material",
+        "religion"
+    ],
+    "moreFields": [
+        "name",
+        "inscription",
+        "operator",
+        "access",
+        "ref",
+        "lit"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "terms": [
+        "arch",
+        "gate",
+        "paifang",
+        "torii"
+    ],
+    "tags": {
+        "man_made": "ceremonial_gate"
+    },
+    "name": "Ceremonial Gate"
+}
diff --git a/data/presets/man_made/ceremonial_gate/paifang.json b/data/presets/man_made/ceremonial_gate/paifang.json
new file mode 100644
index 00000000..6197ec31
--- /dev/null
+++ b/data/presets/man_made/ceremonial_gate/paifang.json
@@ -0,0 +1,34 @@
+{
+    "icon": "roentgen-city_gate",
+    "fields": [
+        "{man_made/ceremonial_gate}"
+    ],
+    "moreFields": [
+        "{man_made/ceremonial_gate}"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "terms": [
+        "chinese gate",
+        "paifong",
+        "pailau",
+        "pailou",
+        "shanmen"
+    ],
+    "tags": {
+        "ceremonial_gate": "paifang"
+    },
+    "addTags": {
+        "man_made": "ceremonial_gate",
+        "ceremonial_gate": "paifang"
+    },
+    "reference": {
+        "key": "ceremonial_gate",
+        "value": "paifang"
+    },
+    "name": "Paifang"
+}
diff --git a/data/presets/man_made/ceremonial_gate/torii.json b/data/presets/man_made/ceremonial_gate/torii.json
new file mode 100644
index 00000000..95cbfb2a
--- /dev/null
+++ b/data/presets/man_made/ceremonial_gate/torii.json
@@ -0,0 +1,31 @@
+{
+    "icon": "temaki-shinto",
+    "fields": [
+        "{man_made/ceremonial_gate}",
+        "colour"
+    ],
+    "moreFields": [
+        "{man_made/ceremonial_gate}"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line"
+    ],
+    "terms": [
+        "Japanese gate",
+        "Shinto shrine"
+    ],
+    "tags": {
+        "ceremonial_gate": "torii"
+    },
+    "addTags": {
+        "man_made": "ceremonial_gate",
+        "ceremonial_gate": "torii"
+    },
+    "reference": {
+        "key": "ceremonial_gate",
+        "value": "torii"
+    },
+    "name": "Torii"
+}
diff --git a/data/presets/man_made/torii.json b/data/presets/man_made/torii.json
deleted file mode 100644
index c3a9d043..00000000
--- a/data/presets/man_made/torii.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "icon": "temaki-shinto",
-    "fields": [
-        "height",
-        "material",
-        "colour",
-        "lit"
-    ],
-    "moreFields": [
-        "operator",
-        "ref"
-    ],
-    "geometry": [
-        "point",
-        "vertex",
-        "line"
-    ],
-    "terms": [
-        "Japanese gate",
-        "Shinto shrine"
-    ],
-    "tags": {
-        "man_made": "torii"
-    },
-    "name": "Torii"
-}