diff --git a/lib/src/italian/MorphoIta.gf b/lib/src/italian/MorphoIta.gf
index 9871f3000..6e5d1c568 100644
--- a/lib/src/italian/MorphoIta.gf
+++ b/lib/src/italian/MorphoIta.gf
@@ -53,19 +53,21 @@ oper
      vin = init vino ;
      n = last vin
    in
-   case o of {
-     "o" => {s = case n of {
+   case vino of {
+     _ + "o" => {s = case n of {
        "c" | "g" => numForms vino (vin + "hi") ;
        "i"       => numForms vino vin ;
        _         => numForms vino (vin + "i")
        } ; g = Masc} ;
-     "a" => {s = case n of {
+     _ + "a" => {s = case n of {
        "c" | "g" => numForms vino (vin + "he") ;
        _         => numForms vino (vin + "e")
        } ; g = Fem} ;
-     "e" => {s = numForms vino (vin + "i")
+     _ + ("ione" | "tudine") => {s = numForms vino (vin + "i")
+       ; g = Fem} ;
+     _ + "e" => {s = numForms vino (vin + "i")
        ; g = Masc} ;
-     "à" | "ù" => {s = numForms vino vino
+     _ + "à" | "ù" => {s = numForms vino vino
        ; g = Fem} ;
      _ => {s = numForms vino vino
        ; g = Masc}
diff --git a/lib/src/spanish/MorphoSpa.gf b/lib/src/spanish/MorphoSpa.gf
index fb6f76717..d57d3e543 100644
--- a/lib/src/spanish/MorphoSpa.gf
+++ b/lib/src/spanish/MorphoSpa.gf
@@ -50,6 +50,7 @@ oper
       _ + "a" => mkNoun (nomVino mec) Fem ;
       _ + "z" => mkNounIrreg mec (init mec + "ces") Fem ;
       _ + "ión" => mkNounIrreg mec (tk 2 mec + "ones") Fem ;
+      _ + "tud" => mkNounIrreg mec (mec + "es") Fem ;
       _ + "án" => mkNounIrreg mec (tk 2 mec + "anes") Masc ;
       _ + "én" => mkNounIrreg mec (tk 2 mec + "enes") Masc ;
       _ + "ín" => mkNounIrreg mec (tk 2 mec + "ines") Masc ;