diff --git a/lib/languages b/lib/languages
index 49ef9903a4..86afbc5c41 100644
--- a/lib/languages
+++ b/lib/languages
@@ -34,7 +34,7 @@ english     english	"English"	false  iso8859-15 en_US	 ""
 esperanto   esperanto	"Esperanto"	false  iso8859-3  eo	 ""
 estonian    estonian	"Estonian"	false  iso8859-15 et_EE	 ""
 # the definitions are only used due to bugs in the arabi-package - remove them if they become unnecessary!
-farsi       farsi	"Farsi"		true   utf8       fa_IR	 "\DeclareTextSymbol{\guillemotright}{LFE}{62}\DeclareTextSymbol{\guillemotleft}{LFE}{60}"
+farsi       farsi	"Farsi"		true   utf8       fa	 "\DeclareTextSymbol{\guillemotright}{LFE}{62}\DeclareTextSymbol{\guillemotleft}{LFE}{60}"
 finnish     finnish	"Finnish"	false  iso8859-15 fi_FI	 ""
 # We redefine \og and \fg (guillemets) for older french language definitions
 french      french 	"French"	false  iso8859-15 fr_FR	 "\addto\extrasfrench{\providecommand{\og}{\leavevmode\flqq~}\providecommand{\fg}{\ifdim\lastskip>\z@\unskip\fi~\frqq}}"
diff --git a/status.16x b/status.16x
index 65538dd65f..dc26f3731d 100644
--- a/status.16x
+++ b/status.16x
@@ -111,6 +111,8 @@ What's new
 
 - In the table dialog, disable the column width and column alignment when
   there is a LaTeX argument (bug 3517).
+  
+- Fix aspell spellchecking with Farsi (bug 7171).
 
 
 * DOCUMENTATION AND LOCALIZATION