Index: resources/data/boundaries.osm
===================================================================
--- resources/data/boundaries.osm	(revision 16376)
+++ resources/data/boundaries.osm	(working copy)
@@ -30006,6 +30006,7 @@
     <nd ref='-16932' />
     <nd ref='-6610' />
     <tag k='ISO3166-1:alpha2' v='IR' />
+    <tag k='ldml:nu:fa' v='arabext' />
     <tag k='name:en' v='Iran, Islamic Rep.' />
   </way>
   <way id='-29072'>
Index: src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- src/org/openstreetmap/josm/tools/I18n.java	(revision 16376)
+++ src/org/openstreetmap/josm/tools/I18n.java	(working copy)
@@ -116,6 +116,7 @@
         languages.put("es", PluralMode.MODE_NOTONE);
         languages.put("et", PluralMode.MODE_NOTONE);
         //languages.put("eu", PluralMode.MODE_NOTONE);
+        languages.put("fa", PluralMode.MODE_GREATERONE);
         languages.put("fi", PluralMode.MODE_NOTONE);
         languages.put("fr", PluralMode.MODE_GREATERONE);
         languages.put("gl", PluralMode.MODE_NOTONE);