Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15305)
+++ trunk/data/defaultpresets.xml	(revision 15307)
@@ -4704,4 +4704,13 @@
             </optional>
         </item> <!-- Entrance -->
+        <item name="Non-public police facility" icon="presets/service/police_non_public.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:police" />
+            <space />
+            <combo key="police" text="Type" values="barracks,car_pound,checkpoint,detention,naval_base,offices,range,storage,training_area,yes" values_context="police" match="keyvalue!" values_searchable="true" />
+            <optional>
+                <text key="name" text="Name" />
+                <text key="operator" text="Operator" />
+            </optional>
+        </item> <!-- Non-public police facility -->
         <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=tower" />
Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15305)
+++ trunk/data/validator/combinations.mapcss	(revision 15307)
@@ -259,5 +259,6 @@
 }
 
-/* {0.tag} together with {1.tag}, see #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
+/* {0.tag} together with {1.tag}, see #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
+*[amenity=police][police],
 node[highway=crossing][crossing=no],
 node[railway=crossing][crossing=no],
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 15305)
+++ trunk/data/validator/deprecated.mapcss	(revision 15307)
@@ -458,5 +458,6 @@
 }
 
-/* see #10661, #10837, #11737, #12771 */
+/* see #17950, #10661, #10837, #11737, #12771 */
+*[police=yes],
 *[traffic_calming=yes],
 *[access=restricted],