Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15166)
+++ trunk/data/defaultpresets.xml	(revision 15169)
@@ -7078,4 +7078,35 @@
         </item> <!-- Recreation Ground -->
         <separator/>
+        <item name="Religious" icon="presets/religion/religion.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:landuse=religious" />
+            <space />
+            <key key="landuse" value="religious" />
+            <text key="name" text="Name" />
+            <reference ref="religious" />
+        </item> <!-- Religious -->
+        <item name="Cemetery" icon="presets/landuse/cemetery.svg" type="closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:landuse=cemetery" />
+            <space />
+            <key key="landuse" value="cemetery" />
+            <text key="name" text="Name" />
+            <reference ref="religious" />
+        </item> <!-- Cemetery -->
+        <item name="Graveyard" icon="presets/landuse/graveyard.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=grave_yard" />
+            <space />
+            <key key="amenity" value="grave_yard" />
+            <text key="name" text="Name" />
+            <reference ref="religious" />
+        </item> <!-- Graveyard -->
+        <item name="Cemetery sector" icon="presets/misc/cemetery_sector.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:cemetery=sector" />
+            <space />
+            <key key="cemetery" value="sector" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="name" text="Name" />
+            </optional>
+        </item> <!-- Cemetery sector-->
+        <separator/>
         <item name="Residential Area" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:landuse=residential" />
@@ -7084,25 +7115,4 @@
             <reference ref="optional_name" />
         </item> <!-- Residential Area -->
-        <item name="Graveyard" icon="presets/landuse/graveyard.svg" type="node,closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:amenity=grave_yard" />
-            <space />
-            <key key="amenity" value="grave_yard" />
-            <text key="name" text="Name" />
-            <reference ref="religious" />
-        </item> <!-- Graveyard -->
-        <item name="Cemetery" icon="presets/landuse/cemetery.svg" type="closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:landuse=cemetery" />
-            <space />
-            <key key="landuse" value="cemetery" />
-            <text key="name" text="Name" />
-            <reference ref="religious" />
-        </item> <!-- Cemetery -->
-        <item name="Religious" icon="presets/religion/religion.svg" type="closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:landuse=religious" />
-            <space />
-            <key key="landuse" value="religious" />
-            <text key="name" text="Name" />
-            <reference ref="religious" />
-        </item> <!-- Religious -->
         <item name="Retail" icon="presets/shop/mall.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:landuse=retail" />
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15166)
+++ trunk/data/validator/combinations.mapcss	(revision 15169)
@@ -592,2 +592,8 @@
   group: tr("suspicious tag combination");
 }
+
+/* #17804 */
+area[cemetery=sector][landuse=cemetery] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("suspicious tag combination");
+}