diff --git a/src/spanish/ExtraSpa.gf b/src/spanish/ExtraSpa.gf
index f8bc683a3..edad4a0a4 100644
--- a/src/spanish/ExtraSpa.gf
+++ b/src/spanish/ExtraSpa.gf
@@ -80,4 +80,10 @@ concrete ExtraSpa of ExtraSpaAbs = ExtraRomanceSpa **
 
     UseComp_estar comp = insertComplement comp.s (predV I.estar_V) ;
 
+    cual_IComp = {
+      s = aagrForms "cual" "cual" "cuáles" "cuáles" ;
+      cop = serCopula ;
+      } ;
+
+
 }
diff --git a/src/spanish/ExtraSpaAbs.gf b/src/spanish/ExtraSpaAbs.gf
index 847b92510..7cab8f283 100644
--- a/src/spanish/ExtraSpaAbs.gf
+++ b/src/spanish/ExtraSpaAbs.gf
@@ -34,4 +34,6 @@ abstract ExtraSpaAbs = ExtraRomanceAbs ** {
 
     UseComp_estar : Comp -> VP ; -- esta lleno, as opposed to es lleno
 
+    cual_IComp : IComp ; -- cual es ...
+
 }
diff --git a/src/spanish/StructuralSpa.gf b/src/spanish/StructuralSpa.gf
index 0af0d0440..ce2467531 100644
--- a/src/spanish/StructuralSpa.gf
+++ b/src/spanish/StructuralSpa.gf
@@ -139,8 +139,8 @@ lin
   when_Subj = ss "cuando" ** {m = Indic} ;
   where_IAdv = ss "dónde" ;
   which_IQuant = {s = table {
-    Sg => \\g,c => prepCase c ++ "qué" ; --- cual
-    Pl => \\g,c => prepCase c ++ "qué" 
+    Sg => \\g,c => prepCase c ++ "cual" ; 
+    Pl => \\g,c => prepCase c ++ "cuales" 
     }
    } ;
   whoPl_IP = {s = \\c => prepCase c ++ "quién" ; a = aagr Masc Pl} ;