Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3390)
+++ trunk/data/defaultpresets.xml	(revision 3391)
@@ -1778,4 +1778,8 @@
             <label text="... other transportation modes possible" />
         </item>
+        <item name="Flagpole" icon="presets/flag.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+            <key key="man_made" value="flagpole" />
+        </item>
         <item name="Information Terminal" icon="presets/information.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 3390)
+++ trunk/styles/standard/elemstyles.xml	(revision 3391)
@@ -1640,4 +1640,12 @@
 
 	<rule>
+		<condition k="man_made" v="flagpost"/>
+		<area colour="manmade#d8d8d8"/>
+		<icon annotate="true" src="presets/flag.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"/>