Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml (revision 5968)
+++ data/defaultpresets.xml (working copy)
@@ -3671,16 +3671,20 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=place_of_worship"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=place_of_worship"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=place_of_worship"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=place_of_worship"
                   no.href="http://wiki.openstreetmap.org/wiki/No:Tag:amenity=place_of_worship"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=place_of_worship"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=place_of_worship"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=place_of_worship"
-                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
+                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship"
+                  zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
             <label text="Edit Place of Worship" />
             <key key="amenity" value="place_of_worship" />
             <text key="name" text="Name" />
+            <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,mosque,synagogue,temple" />
             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
             <combo key="service_times" text="Service Times" values="Su 10:00,Su 10:30,Su 11:00" />