diff --git a/src/estonian/ExtendEst.gf b/src/estonian/ExtendEst.gf
index 80c660d0..694e91dd 100644
--- a/src/estonian/ExtendEst.gf
+++ b/src/estonian/ExtendEst.gf
@@ -54,6 +54,9 @@ concrete ExtendEst of Extend =
     VPI2 = X.VPI ** {c2 : Compl} ;
     [VPI2] = X.ListVPI ** {c2 : Compl}  ;
 
+  linref
+    VPS = X.linVPS (agrP3 Sg) ;
+
   lin
     MkVPS = X.MkVPS ;
     BaseVPS = X.BaseVPS ;
@@ -298,8 +301,12 @@ concrete ExtendEst of Extend =
     GerundAdv vp = {s = infVPdefault vp InfDes} ;
 
     -- : VP -> CN    -- publishing of the document (can get a determiner)
-    GerundCN vp = emptyCN ** {s = \\nf => infVPdefault vp InfMine} ;
-
+    GerundCN vp = emptyCN ** {
+      s = \\nf => infVPdefault vp {stem = InfM ; suf = []}
+               ++ ine.s ! nf ;
+      } where {
+        ine : N = mkN "ine" "ise" "ist" "isesse" "iste" "isi"
+      } ;
     -- : VP -> NP    -- publishing the document (by nature definite)
     GerundNP vp = MassNP (GerundCN vp) ;
 
diff --git a/src/estonian/ExtraEst.gf b/src/estonian/ExtraEst.gf
index 4fc96a0b..0a2e905a 100644
--- a/src/estonian/ExtraEst.gf
+++ b/src/estonian/ExtraEst.gf
@@ -46,6 +46,7 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
     infVPIF : NPForm -> Polarity -> Agr -> VP -> InfStem -> Str = \sc,pol,agr,vp,if ->
       infVPAnt Simul sc pol agr vp {stem=if ; suf="a"} ;
 
+   linVPS : Agr -> {s : Agr => Str} -> Str = \agr,vps -> vps.s ! agr ;
 
   lincat
     VPS = {