Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml     (revision 7415)
+++ data/defaultpresets.xml     (working copy)
@@ -6756,6 +6756,8 @@
                   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 />
+            <label text="A farm within a bigger settlement" />
+            <label text="(please use isolated_dwelling for an isolated farm)" />
             <key key="place" value="farm" />
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />