diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index a7961cfefc..e94bd19cef 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -14,6 +14,8 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
+# LANGUAGE_IS_RTL
+#
 # Arabic language file, translated by:
 # - Mohamed Tarek
 # - Raafat Akkad
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 89475017ba..f7f03a562b 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -14,6 +14,8 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
+# LANGUAGE_IS_RTL
+#
 # Hebrew language file, translated by:
 # - Ariel Saghiv
 # - Liberman Shachar
diff --git a/tools/genlang b/tools/genlang
index 893badb57e..4f7386890d 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -369,6 +369,10 @@ while(<LANG>) {
 
     if($_ =~ /^( *\#|[ \t\n\r]*\z)/) {
         # comment or empty line - output it if it's part of the header
+        if ($_ =~ /LANGUAGE_IS_RTL/) {
+            $langoptions |= $LANGUAGE_FLAG_RTL;
+        }
+
         if ($header and $sortfile) {
             print($_);
         }
@@ -485,12 +489,6 @@ while(<LANG>) {
                 }
                 undef @phrase;
             } # end of </phrase>
-            elsif($part eq "/options") {
-                # closing the options
-                if ($options{'rtl'}) {
-                    $langoptions |= $LANGUAGE_FLAG_RTL;
-                }
-            } # end of </options>
 
             # starts with a slash, this _ends_ this section
             $m = pop @m; # get back old value, the previous level's tag