diff --git a/debian/changelog b/debian/changelog
index bfc232e1..943ab512 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ tasksel (2.82) UNRELEASED; urgency=low
   * Kazakh (Sarsenov D.).  Closes: #587105
   * Dzongkha (yumkee).
   * Korean updated.
+  * Persian added. Closes: #587344
 
   [ Translations of debconf templates ]
   * Bengali updated.
diff --git a/tasks/po/fa.po b/tasks/po/fa.po
new file mode 100644
index 00000000..6caa49bd
--- /dev/null
+++ b/tasks/po/fa.po
@@ -0,0 +1,220 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Fa\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-30 23:31+0200\n"
+"PO-Revision-Date: 2010-06-29 13:53+0900\n"
+"Last-Translator: Vahid Ghaderi <vahid_male1384@yahoo.com>\n"
+"Language-Team: debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Persian\n"
+"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Description
+#: ../po/debian-tasks.desc:1001
+msgid "SQL database"
+msgstr "???????????? ???????? SQL"
+
+#. Description
+#: ../po/debian-tasks.desc:1001
+msgid ""
+"This task selects client and server packages for the PostgreSQL database."
+msgstr ""
+"?????? ?????????? ???????? ?????? ???????? ?? ???????????? ???? ???????? "
+"PostgreSQL ???????????? ??????????."
+
+#. Description
+#: ../po/debian-tasks.desc:1001
+msgid ""
+"PostgreSQL is an SQL relational database, offering increasing SQL92 "
+"compliance and some SQL3 features.  It is suitable for use with multi-user "
+"database access, through its facilities for transactions and fine-grained "
+"locking."
+msgstr ""
+"PostgreSQL  ???? ???????????? ???????? ?????????? ???? "
+"sql. ???????????????? ????????  ???? "
+"SQL3 ????????????.???? ???????? ?????????????? ???? ???????????? ???????? ?????? ?????????? ???? ???????? ?????????????? ??????  "
+"transactions ?? fine-grained locking?????????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:2001
+msgid "Graphical desktop environment"
+msgstr "???????? ???????????? ?????????????? "
+
+#. Description
+#: ../po/debian-tasks.desc:2001
+msgid ""
+"This task provides basic desktop software and serves as a basis for the "
+"GNOME and KDE desktop tasks."
+msgstr ""
+"?????? ?????????? ???????????? ?? ???????????? ???????? ???? ???????? ???????? ?? ???????????? ?????????? ??????????. "
+"KDE "
+
+#. Description
+#: ../po/debian-tasks.desc:3001
+msgid "DNS server"
+msgstr "???????? DNS"
+
+#. Description
+#: ../po/debian-tasks.desc:3001
+msgid ""
+"Selects the BIND DNS server, and related documentation and utility packages."
+msgstr ""
+"?????????????? ?????????? ?? ???????? ?????? ???????????? ?????????? ??  "
+"BIND DNS  ???? ???????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:4001
+msgid "File server"
+msgstr "???????? ????????"
+
+#. Description
+#: ../po/debian-tasks.desc:4001
+msgid ""
+"This task sets up your system to be a file server, supporting both CIFS and "
+"NFS."
+msgstr ""
+"?????? ?????????? ???????????????? ?????? ???? ???? ?????????? ???? ???????? ???????? ????  "
+"CIFS??FS???? ???????????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:5001
+msgid "GNOME desktop environment"
+msgstr "???????? ?????????????? ????????"
+
+#. Description
+#: ../po/debian-tasks.desc:5001
+msgid ""
+"This task provides basic \"desktop\" software using the GNOME desktop "
+"environment."
+msgstr "?????? ?????????? ?????? ???????????????? ???????? ???????? ?????????????? ???? ???????? ???????? ???? ?????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:6001
+msgid "KDE desktop environment"
+msgstr "???????? ?????????????? KDE"
+
+#. Description
+#: ../po/debian-tasks.desc:6001
+msgid ""
+"This task provides basic \"desktop\" software using the K Desktop "
+"Environment."
+msgstr ""
+"?????? ?????????? ?????? ???????????????? ???????? ???????? ?????????????? ???? ???????? "
+"KDE?????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:7001
+msgid "Laptop"
+msgstr "???? ??????"
+
+#. Description
+#: ../po/debian-tasks.desc:7001
+msgid "This task installs software useful for a laptop."
+msgstr "?????? ?????????? ?????? ???????????????? ???????? ???????? ???? ?????? ???? ?????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:8001
+msgid "LXDE desktop environment"
+msgstr "???????? ?????????????? LXDE"
+
+#. Description
+#: ../po/debian-tasks.desc:8001
+msgid ""
+"This task provides basic \"desktop\" software using the LXDE desktop "
+"environment."
+msgstr ""
+"?????? ?????????? ?????? ???????????????? ???????? ???????? ?????????????? ???? ???????? "
+"LXDE?????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:9001
+msgid "Mail server"
+msgstr "???????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:9001
+msgid ""
+"This task selects a variety of package useful for a general purpose mail "
+"server system."
+msgstr "?????? ?????????? ???????? ?????? ?????????? ?? ?????????? ???? ???????? ?????????? ?????????? ???????? ???????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:10001
+msgid "manual package selection"
+msgstr "???????????? ???????? ???????? ????"
+
+#. Description
+#: ../po/debian-tasks.desc:10001
+msgid "Manually select packages to install in aptitude."
+msgstr "???????????? ???????? ???????? ???? ???????? ?????? ????  aptitude"
+
+#. Description
+#: ../po/debian-tasks.desc:11001
+msgid "Print server"
+msgstr "?????????? ????????"
+
+#. Description
+#: ../po/debian-tasks.desc:11001
+msgid "This task sets up your system to be a print server."
+msgstr "?????? ?????????? ?????????? ?????? ???? ???? ?????????? ?????????? ???????? ?????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:12001
+msgid "SSH server"
+msgstr "SSH ????????"
+
+#. Description
+#: ../po/debian-tasks.desc:12001
+msgid ""
+"This task sets up your system to be remotely accessed through SSH "
+"connections."
+msgstr ""
+"?????? ?????????? ?????????? ?????? ???? ???????? ???????????? ???? ?????? ?????? ???? ???????? ?????????? "
+"SSh?????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:13001
+msgid "Standard system utilities"
+msgstr "???????????????? ?????????????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:13001
+msgid ""
+"This task sets up a basic user environment, providing a reasonably small "
+"selection of services and tools usable on the command line."
+msgstr "?????? ?????????? ???? ???????? ?????????? ?????????? ???? ?????????? ?????????????????? ?????????? ???? ???????? ???????? ???? ???? ?????????? ???? ?????????? ??????????"
+
+#. Description
+#: ../po/debian-tasks.desc:14001
+msgid "Web server"
+msgstr "?????????? ?????????? ????"
+
+#. Description
+#: ../po/debian-tasks.desc:14001
+msgid ""
+"This task selects packages useful for a general purpose web server system."
+msgstr "?????? ?????????? ???????? ?????? ?????????? ???? ???????? ?????????? ???? ???????? ???????????? ??????????."
+
+#. Description
+#: ../po/debian-tasks.desc:15001
+msgid "Xfce desktop environment"
+msgstr "???????? ???????????? Xfce"
+
+#. Description
+#: ../po/debian-tasks.desc:15001
+msgid ""
+"This task provides basic \"desktop\" software using the Xfce desktop "
+"environment."
+msgstr ""
+"?????? ?????????? ?????? ???????????????? ???????? ???????? ???????? ???? ???????? ???????????? "
+"Xfce ???? ?????????? ?????????? "