diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6949e7801..c72d5f5ec 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -221,6 +221,7 @@
                 "chancel",
                 "chantry",
                 "chapel",
+                "church",
                 "fold",
                 "house of God",
                 "house of prayer",
@@ -555,6 +556,24 @@
             "address"
         ]
     },
+    {
+        "name": "library",
+        "match": {
+            "type": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "amenity": "library"
+            }
+        },
+        "icon": "library",
+        "form": [
+            "operator",
+            "building_area",
+            "address"
+        ]
+    },
     {
         "name": "museum",
         "match": {