Index: styles/standard/elemstyles.xml
===================================================================
--- styles/standard/elemstyles.xml	(revision 3387)
+++ styles/standard/elemstyles.xml	(working copy)
@@ -1639,6 +1639,13 @@
 	</rule>
 
 	<rule>
+		<condition k="man_made" v="flagpole"/>
+		<icon annotate="true" src="misc/flagpole.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="man_made" v="gasometer"/>
 		<icon annotate="true" src="misc/landmark/gasometer.png"/>
 		<area colour="manmade#d8d8d8"/>
Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 3387)
+++ data/defaultpresets.xml	(working copy)
@@ -2409,6 +2409,14 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="surveillance" text="Type" values="indoor,outdoor,public" default="" />
         </item>
+	<item name="Flag Pole" icon="styles/standard/misc/flagpole.png" type="node">
+	    <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole" />
+	    <label text="Edit Flag Pole" />
+	    <key key="man_made" value="flagpole" />
+	    <text key="operator" text="Operator" default="" delete_if_empty="true" />
+	    <text key="height" text="Height" default="" delete_if_empty="true" />
+	    <combo key="type" text="Type" values="signal,national,governmental" default="" />
+	</item>
         <separator/>
         <item name="Power Generator" icon="presets/power.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"