Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17513)
+++ trunk/resources/data/defaultpresets.xml	(revision 17525)
@@ -1050,4 +1050,9 @@
             </optional>
         </item> <!-- Ford -->
+        <item name="Traffic Hazard" icon="presets/transport/hazard.svg" type="node,way" preset_name_label="true">
+            <link wiki="Key:hazard" />
+            <space />
+            <combo key="hazard" text="Hazard" values="animal_crossing,bump,children,curve,curves,cyclists,dangerous_junction,dip,falling_rocks,frost_heave,horse_riders,ice,landslide,loose_gravel,low_flying_aircraft,pedestrians,queues_likely,school_zone,side_winds,slippery,turn,turns" values_context="hazard" />
+        </item> <!-- Traffic Hazard -->
     </group> <!-- Streets -->
     <group name="Ways" icon="presets/transport/way/way_unclassified.svg">
@@ -7809,4 +7814,13 @@
             </optional>
         </item> <!-- Protected Area -->
+        <item name="Hazardous Area" icon="presets/misc/boundaries.svg" type="closedway,relation" preset_name_label="true">
+            <link wiki="Tag:boundary=hazard" />
+            <space />
+            <key key="boundary" value="hazard" />
+            <combo key="hazard" text="Hazard" values="contamination,minefield,nuclear,shooting_range,unexploded_ordnance" values_context="hazard" />
+            <optional>
+                <text key="related_law" text="Related law" />
+            </optional>
+        </item> <!-- Hazardous Area -->
         <item name="Maritime" icon="presets/misc/boundaries.svg" type="way,closedway,relation" preset_name_label="true">
             <link wiki="Tag:boundary=maritime" />