diff --git a/src/estonian/CatEst.gf b/src/estonian/CatEst.gf
index a91a245e0..57b891d04 100644
--- a/src/estonian/CatEst.gf
+++ b/src/estonian/CatEst.gf
@@ -50,7 +50,7 @@ concrete CatEst of Cat = CommonX ** open HjkEst, ResEst, Prelude in {
     CN   = {s : NForm => Str} ;
     Pron = {s : NPForm => Str ; a : Agr} ;
     NP   = {s : NPForm => Str ; a : Agr ; isPron : Bool} ;
-    Det  = {
+    DAP, Det  = {
       s : Case => Str ;       -- minun kolme
       sp : Case => Str ;       -- se   (substantival form)
       n : Number ;             -- Pl   (agreement feature for verb)
diff --git a/src/estonian/NounEst.gf b/src/estonian/NounEst.gf
index a2167f415..2d873ab65 100644
--- a/src/estonian/NounEst.gf
+++ b/src/estonian/NounEst.gf
@@ -106,6 +106,21 @@ concrete NounEst of Noun = CatEst ** open ResEst, HjkEst, MorphoEst, Prelude in
       isDef = quant.isDef
       } ;
 
+    DetDAP det = det ;
+
+    AdjDAP dap ap = dap ** {
+      s = \\c => dap.s ! c ++
+                   case ap.infl of {
+                     Regular => ap.s ! True ! NCase dap.n c ;
+                     _ => ap.s ! True ! NCase dap.n Nom  ---- participle
+                 } ;
+      sp = \\c => dap.sp ! c ++
+                   case ap.infl of {
+                     Regular => ap.s ! True ! NCase dap.n c ;
+                     _ => ap.s ! True ! NCase dap.n Nom  ---- participle
+                 } ;
+      } ;
+
     PossPron p = {
       s,sp = \\_,_ => p.s ! NPCase Gen ;
       isNum = False ;