Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17059)
+++ trunk/resources/data/defaultpresets.xml	(revision 17064)
@@ -4051,4 +4051,17 @@
             <preset_link preset_name="Building" />
         </item> <!-- Other Place of Worship -->
+        <separator/>
+        <item name="Monastery" icon="presets/religion/monastery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=monastery" />
+            <space />
+            <key key="amenity" value="monastery" />
+            <text key="name" text="Name" />
+            <reference ref="religious" />
+            <combo key="community:gender" text="Community gender" values="female,male,mixed" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="wikipedia_wikidata" />
+            <reference ref="link_contact_address" />
+            <preset_link preset_name="Historic monastery" text="Similar but different tags:" />
+        </item> <!-- Monastery -->
     </group> <!-- Place of Worship -->
     <group name="Public Building" icon="presets/service/townhall.svg">
@@ -5309,5 +5322,5 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,fire_station,garage,garages,gasometer,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,mosque,office,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,fire_station,garage,garages,gasometer,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,monastery,mosque,office,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <text key="name" text="Name" />
@@ -6386,4 +6399,15 @@
             <reference ref="religious"/>
         </item> <!-- Church -->
+        <item name="Historic monastery" icon="presets/sightseeing/monastery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=monastery" />
+            <space />
+            <key key="historic" value="monastery" />
+            <optional>
+            <text key="name" text="Name" />
+                <reference ref="religious" />
+                <reference ref="wikipedia_wikidata" />
+            </optional>
+            <preset_link preset_name="Monastery" text="Similar but different tags:" />
+        </item> <!-- Monastery -->
         <separator/>
         <item name="Charcoal pile" icon="presets/misc/charcoal_pile.svg" type="node,closedway,multipolygon" preset_name_label="true">