diff --git a/src/abstract/Extend.gf b/src/abstract/Extend.gf
index 21e7b8f92..c35e3617f 100644
--- a/src/abstract/Extend.gf
+++ b/src/abstract/Extend.gf
@@ -290,6 +290,10 @@ fun UseDAP     : DAP -> NP ;
 
 cat X ; -- for words that are difficult to classify, mainly for MorphoDict
 
+fun
+  UseComp_estar : Comp -> VP ; -- esta lleno, as opposed to es lleno
+  UseComp_ser : Comp -> VP ; -- es lleno, as opposed to esta lleno
+
 fun
   CardCNCard : Card -> CN -> Card ;  -- three million, four lakh, six dozen etc
 
diff --git a/src/bulgarian/ExtendBul.gf b/src/bulgarian/ExtendBul.gf
index c56d1e3f0..0ca1aa0b6 100644
--- a/src/bulgarian/ExtendBul.gf
+++ b/src/bulgarian/ExtendBul.gf
@@ -300,6 +300,9 @@ lin UseDAP dap = {
       p  = NounP3 dap.p
       } ;
 
+lin UseComp_estar = UseComp ;
+    UseComp_ser = UseComp ;
+
 lin GivenName = \n -> {
        s  = n.s ;
        gn = GSg (sex2gender n.g)
diff --git a/src/common/ExtendFunctor.gf b/src/common/ExtendFunctor.gf
index 667b6791b..a5711b37c 100644
--- a/src/common/ExtendFunctor.gf
+++ b/src/common/ExtendFunctor.gf
@@ -136,6 +136,10 @@ lin
 lincat
   X = {s : Str} ;
 
+lin
+  UseComp_estar = UseComp ;
+  UseComp_ser = UseComp ;
+
 lin
   CardCNCard = variants {} ;
 
diff --git a/src/spanish/ExtendSpa.gf b/src/spanish/ExtendSpa.gf
index df7491847..9dadff7a6 100644
--- a/src/spanish/ExtendSpa.gf
+++ b/src/spanish/ExtendSpa.gf
@@ -20,7 +20,8 @@ concrete ExtendSpa of Extend = CatSpa ** ExtendRomanceFunctor -
  youPolFem_Pron,
  youPolPlFem_Pron,
  youPolPl_Pron,
- PassVPSlash, PassAgentVPSlash
+ PassVPSlash, PassAgentVPSlash,
+ UseComp_estar, UseComp_ser
     ]                   -- don't forget to put the names of your own
                        -- definitions here
   with
@@ -31,7 +32,8 @@ concrete ExtendSpa of Extend = CatSpa ** ExtendRomanceFunctor -
   MorphoSpa,
   Coordination,
   Prelude,
-  ParadigmsSpa in {
+  ParadigmsSpa,
+  (I=IrregSpa) in {
     -- put your own definitions here
 
   lin
@@ -101,6 +103,9 @@ concrete ExtendSpa of Extend = CatSpa ** ExtendRomanceFunctor -
         cop = serCopula
       } ;
 
+lin UseComp_estar comp = insertComplement comp.s (predV I.estar_V) ;
+    UseComp_ser comp = insertComplement comp.s (predV copula) ;
+
 lin GivenName, MaleSurname, FemaleSurname = \n -> n ;
 lin FullName gn sn = {
        s = gn.s ++ sn.s ;