diff --git a/src/arabic/ParadigmsAra.gf b/src/arabic/ParadigmsAra.gf
index fe8bc4d59..ba6473fda 100644
--- a/src/arabic/ParadigmsAra.gf
+++ b/src/arabic/ParadigmsAra.gf
@@ -559,8 +559,9 @@ resource ParadigmsAra = open
   mkA2V v p = mkA2 v p ** {lock_A2 = <>} ;
 
 
-smartN : Str -> N = \s -> case last s of {
-  "ة" => mkFullN (sndf s) Fem NoHum ;
+smartN : Str -> N = \s -> case s of {
+  _ + "ة" => mkFullN (sndf s) Fem NoHum ;
+  _ + "ة" + #vow => mkFullN (sndf s) Fem NoHum ;
   _ => mkFullN (sndm s) Masc NoHum
   } ;
 
diff --git a/src/arabic/ResAra.gf b/src/arabic/ResAra.gf
index c048bd84f..3cc153581 100644
--- a/src/arabic/ResAra.gf
+++ b/src/arabic/ResAra.gf
@@ -856,7 +856,9 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
       \caSaA ->
       case caSaA of {
         lemma + ("ا"|"ى") => \\s,c => defArt s lemma + "ي" + dl ! s ! c ;
-        _                 => \\s,c => defArt s caSaA + dl ! s ! c
+        lemma + "ة" =>
+          \\s,c => defArt s (lemma + "ت") + dl ! s ! c ;
+        _  => \\s,c => defArt s caSaA + dl ! s ! c
       };
 
     -- takes a singular word and gives the corresponding sound
@@ -953,12 +955,12 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
         Const =>
           table {
             Nom => "َا";
-            _   => "َي"
+            _   => "َيْ‎"
           };
         _ =>
           table {
             Nom => "َانِ";
-            _   => "َينِ"
+            _   => "َيْ‎نِ"
           }
       };