Index: applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- applications/editors/josm/plugins/tageditor/build.xml	(revision 18679)
+++ applications/editors/josm/plugins/tageditor/build.xml	(revision 18700)
@@ -28,5 +28,5 @@
     
 
-	<property name="commit.message" value="Updated build.xml" />		
+	<property name="commit.message" value="Updated tag definitions (thanks to Hans F. Nordhaug)" />		
 	<property name="plugin.main.version" value="2355" />
 
Index: applications/editors/josm/plugins/tageditor/resources/osm-tag-definitions.xml
===================================================================
--- applications/editors/josm/plugins/tageditor/resources/osm-tag-definitions.xml	(revision 18679)
+++ applications/editors/josm/plugins/tageditor/resources/osm-tag-definitions.xml	(revision 18700)
@@ -40,4 +40,6 @@
 		<label value="emergency_access_point" for-node="yes"/>
 		<label value="motorway_junction" for-node="yes"/>
+		<label value="speed_camera" for-node="yes"/>
+		<label value="passing_place" for-node="yes"/>
 	</tag>	
 	
@@ -977,9 +979,12 @@
 		<label value="city"  for-way="yes" for-node="yes"/>
 		<label value="town"  for-way="yes" for-node="yes"/>
+		<label value="municipality"  for-way="yes" for-node="yes"/>
 		<label value="village"  for-way="yes" for-node="yes"/>
 		<label value="hamlet"  for-way="yes" for-node="yes"/>
 		<label value="suburb"  for-way="yes" for-node="yes"/>
 		<label value="locality"  for-way="yes" for-node="yes"/>
+		<label value="farm"  for-way="yes" for-node="yes"/>
 		<label value="island"  for-way="yes" for-node="yes"/>		
+		<label value="islet"  for-way="yes" for-node="yes"/>		
 	</tag>
 	
@@ -988,6 +993,23 @@
 	<tag key="postal_code" type="xs:string" for-way="yes" for-node="yes" />
 	<tag key="is_in" type="xs:string" for-way="yes" for-node="yes" />
+	<tag key="is_in:continent" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:country" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:country_code" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:state" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:state_code" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:region" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:county" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:city" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:town" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:municipality" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:village" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:hamlet" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:suburb" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:locality" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:farm" type="xs:string" for-way="yes" for-node="yes"/>
+	<tag key="is_in:island" type="xs:string" for-way="yes" for-node="yes"/>		
+	<tag key="is_in:islet" type="xs:string" for-way="yes" for-node="yes"/>		
 	<tag key="population" type="xs:integer" for-way="yes" for-node="yes" />
-	
+
 	<tag key="note" type="xs:string" for-way="yes" for-node="yes" />
 	<tag key="description" type="xs:string" for-way="yes" for-node="yes" />