Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 14117)
+++ trunk/data/defaultpresets.xml	(revision 14123)
@@ -7940,4 +7940,13 @@
             <preset_link preset_name="Power Substation" />
         </item> <!-- Transformer Tower -->
+        <item name="Terminal" icon="presets/power/terminal.svg" type="node" preset_name_label="true">
+            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=terminal" />
+            <space />
+            <key key="power" value="terminal" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="operator" text="Operator" />
+            </optional>
+        </item> <!-- Terminal -->
         <item name="Power Portal" icon="presets/power/portal.svg" type="node,way" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:power=portal"
@@ -8035,4 +8044,13 @@
             <reference ref="optional_transformer_rating_phases_devices_windings" />
         </item> <!-- Pole with Transformer -->
+        <item name="Catenary mast" icon="presets/power/catenary_mast.svg" type="node" preset_name_label="true">
+            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=catenary_mast" />
+            <space />
+            <key key="power" value="catenary_mast" />
+            <optional>
+                <text key="ref" text="Reference" />
+                <text key="operator" text="Operator" />
+            </optional>
+        </item> <!-- Catenary mast -->
         <item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:power=insulator"
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 14117)
+++ trunk/data/validator/geometry.mapcss	(revision 14123)
@@ -97,4 +97,6 @@
 way[power=transformer],
 way[power=pole],
+way[power=catenary_mast],
+way[power=terminal],
 way[power=tower]!:closed,
 way[amenity=vending_machine],
Index: trunk/data/validator/ignoretags.cfg
===================================================================
--- trunk/data/validator/ignoretags.cfg	(revision 14117)
+++ trunk/data/validator/ignoretags.cfg	(revision 14123)
@@ -325,9 +325,8 @@
 ;
 ; Tags not yet decided (to remove from this section when added or deprecated) 
-; see josm tickets: 10759 15769 16315
+; see josm tickets: 10759 16315
 ;
 K:man_made=mast
 K:amenity=childcare
 K:landuse=logging
-K:power=catenary_mast
 K:indoor=room