diff --git a/editors/openoffice3-dicts/Makefile b/editors/openoffice3-dicts/Makefile
index b1fada5cab4..b7524f59f1a 100644
--- a/editors/openoffice3-dicts/Makefile
+++ b/editors/openoffice3-dicts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/05/20 12:51:41 robert Exp $
+# $OpenBSD: Makefile,v 1.7 2010/06/26 14:45:59 robert Exp $
 
 PKG_ARCH=	*
 
@@ -20,8 +20,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://blade2k.humppa.hu/openoffice3-dicts/
 
-LANGUAGES=	ar_AR de_DE en_GB en_US fa_FA fr_FR hu_HU nl_NL \
-		pl_PL ru_RU sl_SL
+LANGUAGES=	ar_AR de_DE en_GB en_US fa_IR fr_FR hu_HU nl_NL \
+		pl_PL ru_RU sl_SI
 
 EXTRACT_CASES=	*.oxt) break;; 
 
diff --git a/editors/openoffice3-dicts/distinfo b/editors/openoffice3-dicts/distinfo
index 0d8f19b74cd..171c2ac3241 100644
--- a/editors/openoffice3-dicts/distinfo
+++ b/editors/openoffice3-dicts/distinfo
@@ -2,54 +2,54 @@ MD5 (openoffice3-dicts-0.1/ar_AR.oxt) = wUI73cWFW8YZ/kOvT/kzAA==
 MD5 (openoffice3-dicts-0.1/de_DE.oxt) = qiMQfckxT0odNF/h+7HH1w==
 MD5 (openoffice3-dicts-0.1/en_GB.oxt) = 3G2fivt5XLRa+Ghj8yqKRQ==
 MD5 (openoffice3-dicts-0.1/en_US.oxt) = 4uq4B3KrGqCXFpVCGTUagA==
-MD5 (openoffice3-dicts-0.1/fa_FA.oxt) = MXxHD05iPngz7Gh/95T2ew==
+MD5 (openoffice3-dicts-0.1/fa_IR.oxt) = MXxHD05iPngz7Gh/95T2ew==
 MD5 (openoffice3-dicts-0.1/fr_FR.oxt) = 3ldZBlGBve3rdRkPWdVn2w==
 MD5 (openoffice3-dicts-0.1/hu_HU.oxt) = B5qKi3OstpgE/Z+jtS1S2A==
 MD5 (openoffice3-dicts-0.1/nl_NL.oxt) = SE4Gj6G7OUPyJrh3INpOIQ==
 MD5 (openoffice3-dicts-0.1/pl_PL.oxt) = pp+SIYZLE2Djj/PwsMySIg==
 MD5 (openoffice3-dicts-0.1/ru_RU.oxt) = HZCl5xCZaY+o57nINhO+6Q==
-MD5 (openoffice3-dicts-0.1/sl_SL.oxt) = I49t1SizFvub1AMDpKwfEQ==
+MD5 (openoffice3-dicts-0.1/sl_SI.oxt) = I49t1SizFvub1AMDpKwfEQ==
 RMD160 (openoffice3-dicts-0.1/ar_AR.oxt) = 9tjGy50qkPauVId5SJl2CrK87fs=
 RMD160 (openoffice3-dicts-0.1/de_DE.oxt) = 2nfNq2vERmV5afUaUXyifSebn8s=
 RMD160 (openoffice3-dicts-0.1/en_GB.oxt) = AXnmjAn7kZt4KZLhs67JhCYHlKM=
 RMD160 (openoffice3-dicts-0.1/en_US.oxt) = 7OUC+on7hCsH1TImx/BqLm5ENnk=
-RMD160 (openoffice3-dicts-0.1/fa_FA.oxt) = aJcqShTxbfr2f7jEfz7dpqUI4zE=
+RMD160 (openoffice3-dicts-0.1/fa_IR.oxt) = aJcqShTxbfr2f7jEfz7dpqUI4zE=
 RMD160 (openoffice3-dicts-0.1/fr_FR.oxt) = fBc+2hXzK11gw9oKnnc5xmRbWj8=
 RMD160 (openoffice3-dicts-0.1/hu_HU.oxt) = mzFk8ApTXs9tXY4umd09gUPIhzU=
 RMD160 (openoffice3-dicts-0.1/nl_NL.oxt) = EsYlu2oCH3sFrm1Q8I23kT5CanU=
 RMD160 (openoffice3-dicts-0.1/pl_PL.oxt) = CVU9+0ft2tyUO+EeuDXOIuwj9Eg=
 RMD160 (openoffice3-dicts-0.1/ru_RU.oxt) = IDzMcUsopCQEor0jmC14yb2GfbE=
-RMD160 (openoffice3-dicts-0.1/sl_SL.oxt) = sW+oV22mlQh5CYpn9/3xMdTP73w=
+RMD160 (openoffice3-dicts-0.1/sl_SI.oxt) = sW+oV22mlQh5CYpn9/3xMdTP73w=
 SHA1 (openoffice3-dicts-0.1/ar_AR.oxt) = /lszzr7s+3zQrY6CY1ykLUo9U7k=
 SHA1 (openoffice3-dicts-0.1/de_DE.oxt) = LRo/776Q7w3ja/dNsT+cyWzR8Bk=
 SHA1 (openoffice3-dicts-0.1/en_GB.oxt) = 61rsyBjuHlBLFwss2GpNzbJOTTE=
 SHA1 (openoffice3-dicts-0.1/en_US.oxt) = 9vdPbJkPK1QnAUGdNAlQX6EggyU=
-SHA1 (openoffice3-dicts-0.1/fa_FA.oxt) = Nb3fu7h8hF7KRMvCMWAsEiCesrk=
+SHA1 (openoffice3-dicts-0.1/fa_IR.oxt) = Nb3fu7h8hF7KRMvCMWAsEiCesrk=
 SHA1 (openoffice3-dicts-0.1/fr_FR.oxt) = 9Uga6V2oZ635ksX4jHoC1zUTlAY=
 SHA1 (openoffice3-dicts-0.1/hu_HU.oxt) = 6XiN7+zusmb/VSRI7kOawtG50IA=
 SHA1 (openoffice3-dicts-0.1/nl_NL.oxt) = rMUhZbWcGbKvkrt+JPxJ+hrGvjM=
 SHA1 (openoffice3-dicts-0.1/pl_PL.oxt) = 1XBO/HNfVJIoTouc0upxenAAM8M=
 SHA1 (openoffice3-dicts-0.1/ru_RU.oxt) = 73pp9cQeKylzDt5SilSizfc2m5s=
-SHA1 (openoffice3-dicts-0.1/sl_SL.oxt) = mO4yKGMfp6rRGWn3nqUaX4CeqBc=
+SHA1 (openoffice3-dicts-0.1/sl_SI.oxt) = mO4yKGMfp6rRGWn3nqUaX4CeqBc=
 SHA256 (openoffice3-dicts-0.1/ar_AR.oxt) = COgmGX7e0QJ99MO4Fxfn0vcTXiLdOXR5AdhW49JngJ0=
 SHA256 (openoffice3-dicts-0.1/de_DE.oxt) = md3d+RpYnFX3OeL2nYLaagcwABN07IpHRAox/Ei6rtg=
 SHA256 (openoffice3-dicts-0.1/en_GB.oxt) = lA+xpCKmy3uu3uEexG1WaErOBa/iUb9/A7DJHJ3E0ro=
 SHA256 (openoffice3-dicts-0.1/en_US.oxt) = YaUtizvWolX0u1XeEDm9f7/FlifVfdk0Ag446r5yaDk=
-SHA256 (openoffice3-dicts-0.1/fa_FA.oxt) = 9tafcw5UeAbVVDC+3QJpeFyyL2Pk3HN5CuvZQCTSQE0=
+SHA256 (openoffice3-dicts-0.1/fa_IR.oxt) = 9tafcw5UeAbVVDC+3QJpeFyyL2Pk3HN5CuvZQCTSQE0=
 SHA256 (openoffice3-dicts-0.1/fr_FR.oxt) = wNntejKLDyHsRTnNTBRqjBqV6sQlCBlQsC9ppbfEGT4=
 SHA256 (openoffice3-dicts-0.1/hu_HU.oxt) = v/1KuZjJxgekTFdk8mzWe1WsnieSLIvuCjMgtGm3goU=
 SHA256 (openoffice3-dicts-0.1/nl_NL.oxt) = qcDxskhMNRX0HjPM1uupzBFrA/thsScMDKX9sc+HSuU=
 SHA256 (openoffice3-dicts-0.1/pl_PL.oxt) = A6HU3QFhnj0OePkaBMDBtYHFpLOWgvzZ8oGo4il4vEk=
 SHA256 (openoffice3-dicts-0.1/ru_RU.oxt) = GP0Tg6IkJpKtNuSesdt76mJ93MV1yH6x7LvK9ica3qE=
-SHA256 (openoffice3-dicts-0.1/sl_SL.oxt) = jVLWCqyg8tJTiCzqyk0qTawK5/gbdQ0aDfxZU+MBN6w=
+SHA256 (openoffice3-dicts-0.1/sl_SI.oxt) = jVLWCqyg8tJTiCzqyk0qTawK5/gbdQ0aDfxZU+MBN6w=
 SIZE (openoffice3-dicts-0.1/ar_AR.oxt) = 304573
 SIZE (openoffice3-dicts-0.1/de_DE.oxt) = 2081230
 SIZE (openoffice3-dicts-0.1/en_GB.oxt) = 235258
 SIZE (openoffice3-dicts-0.1/en_US.oxt) = 229064
-SIZE (openoffice3-dicts-0.1/fa_FA.oxt) = 911407
+SIZE (openoffice3-dicts-0.1/fa_IR.oxt) = 911407
 SIZE (openoffice3-dicts-0.1/fr_FR.oxt) = 2131295
 SIZE (openoffice3-dicts-0.1/hu_HU.oxt) = 1964127
 SIZE (openoffice3-dicts-0.1/nl_NL.oxt) = 1016639
 SIZE (openoffice3-dicts-0.1/pl_PL.oxt) = 2516203
 SIZE (openoffice3-dicts-0.1/ru_RU.oxt) = 535427
-SIZE (openoffice3-dicts-0.1/sl_SL.oxt) = 1242708
+SIZE (openoffice3-dicts-0.1/sl_SI.oxt) = 1242708
diff --git a/editors/openoffice3-dicts/pkg/DESCR-fa_FA b/editors/openoffice3-dicts/pkg/DESCR-fa_FA
deleted file mode 100644
index f4e7fa50c65..00000000000
--- a/editors/openoffice3-dicts/pkg/DESCR-fa_FA
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a Persian/Farsi (fa_FA) dictionary package
-for OOo spellchecker. 
diff --git a/editors/openoffice3-dicts/pkg/DESCR-fa_IR b/editors/openoffice3-dicts/pkg/DESCR-fa_IR
new file mode 100644
index 00000000000..02f7c924c3d
--- /dev/null
+++ b/editors/openoffice3-dicts/pkg/DESCR-fa_IR
@@ -0,0 +1,2 @@
+This is a Persian/Farsi (fa_IR) dictionary package
+for OOo spellchecker. 
diff --git a/editors/openoffice3-dicts/pkg/DESCR-sl_SI b/editors/openoffice3-dicts/pkg/DESCR-sl_SI
new file mode 100644
index 00000000000..6ab1a6a5ff4
--- /dev/null
+++ b/editors/openoffice3-dicts/pkg/DESCR-sl_SI
@@ -0,0 +1 @@
+Dictionary pack (sl_SI) for OpenOffice.Org 3.
diff --git a/editors/openoffice3-dicts/pkg/DESCR-sl_SL b/editors/openoffice3-dicts/pkg/DESCR-sl_SL
deleted file mode 100644
index 00ba6c4c066..00000000000
--- a/editors/openoffice3-dicts/pkg/DESCR-sl_SL
+++ /dev/null
@@ -1 +0,0 @@
-Dictionary pack (sl_SL) for OpenOffice.Org 3.
diff --git a/editors/openoffice3-dicts/pkg/PLIST-fa_FA b/editors/openoffice3-dicts/pkg/PLIST-fa_IR
similarity index 59%
rename from editors/openoffice3-dicts/pkg/PLIST-fa_FA
rename to editors/openoffice3-dicts/pkg/PLIST-fa_IR
index 7b003b0e397..12056cfad0c 100644
--- a/editors/openoffice3-dicts/pkg/PLIST-fa_FA
+++ b/editors/openoffice3-dicts/pkg/PLIST-fa_IR
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST-fa_FA,v 1.1 2010/05/20 12:51:41 robert Exp $
+@comment $OpenBSD: PLIST-fa_IR,v 1.1 2010/06/26 14:46:00 robert Exp $
 @pkgpath editors/openoffice3-dicts
 @pkgpath editors/openoffice3-dicts,-main
-openoffice.org3/share/extension/install/fa_FA.oxt
-@exec %D/openoffice.org3/program/unopkg add --shared %D/openoffice.org3/share/extension/install/fa_FA.oxt > /dev/null 2>&1
+openoffice.org3/share/extension/install/fa_IR.oxt
+@exec %D/openoffice.org3/program/unopkg add --shared %D/openoffice.org3/share/extension/install/fa_IR.oxt > /dev/null 2>&1
 @unexec %D/openoffice.org3/program/unopkg remove --shared org.openoffice.fa.dictionaries.fa > /dev/null 2>&1
diff --git a/editors/openoffice3-dicts/pkg/PLIST-sl_SL b/editors/openoffice3-dicts/pkg/PLIST-sl_SI
similarity index 59%
rename from editors/openoffice3-dicts/pkg/PLIST-sl_SL
rename to editors/openoffice3-dicts/pkg/PLIST-sl_SI
index 5be7cbc6933..fb686228a48 100644
--- a/editors/openoffice3-dicts/pkg/PLIST-sl_SL
+++ b/editors/openoffice3-dicts/pkg/PLIST-sl_SI
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST-sl_SL,v 1.2 2009/02/15 10:29:58 robert Exp $
+@comment $OpenBSD: PLIST-sl_SI,v 1.1 2010/06/26 14:46:00 robert Exp $
 @pkgpath editors/openoffice3-dicts
 @pkgpath editors/openoffice3-dicts,-main
-openoffice.org3/share/extension/install/sl_SL.oxt
-@exec %D/openoffice.org3/program/unopkg add --shared %D/openoffice.org3/share/extension/install/sl_SL.oxt > /dev/null 2>&1
+openoffice.org3/share/extension/install/sl_SI.oxt
+@exec %D/openoffice.org3/program/unopkg add --shared %D/openoffice.org3/share/extension/install/sl_SI.oxt > /dev/null 2>&1
 @unexec %D/openoffice.org3/program/unopkg remove --shared org.openoffice.sl.dictionaries.sl > /dev/null 2>&1