Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7410)
+++ trunk/data/defaultpresets.xml	(revision 7415)
@@ -6752,4 +6752,13 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
+        <item name="Farm" icon="presets/places.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=farm"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=farm"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=farm" />
+            <space />
+            <key key="place" value="farm" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
+        </item> <!-- Farm -->
         <item name="Isolated Dwelling" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"