diff --git a/examples/letter/README b/examples/letter/README
index eb5724dc7..734b5eb32 100644
--- a/examples/letter/README
+++ b/examples/letter/README
@@ -28,7 +28,9 @@ For the actual use, type then
 
   jgf Letter.gfcm
 
-and select "Letter" from the "Cat" menu.
+and select "Letter" from the "New" menu.
 
 Copyright (c) 2001-2004 Janna Khegai, Aarne Ranta
 under GNU General Public License (GPL).
+
+Document last updated August 3, 2004, by Aarne Ranta.
diff --git a/grammars/Makefile b/grammars/Makefile
new file mode 100644
index 000000000..6d22fc4c6
--- /dev/null
+++ b/grammars/Makefile
@@ -0,0 +1,6 @@
+distr:
+	sh mkDistr.sh
+
+test:
+	sh tst.sh
+
diff --git a/grammars/mkDistr.sh b/grammars/mkDistr.sh
index 27632e2f9..21ec0c8fd 100644
--- a/grammars/mkDistr.sh
+++ b/grammars/mkDistr.sh
@@ -1,41 +1,43 @@
-rm -rf grammars
-mkdir -pv grammars
-mkdir -pv grammars/letter
-mkdir -pv grammars/logic
-mkdir -pv grammars/numerals
-mkdir -pv grammars/prelude
-mkdir -pv grammars/resource
-mkdir -pv grammars/resource/abstract
-mkdir -pv grammars/resource/english
-mkdir -pv grammars/resource/finnish
-mkdir -pv grammars/resource/french
-mkdir -pv grammars/resource/german
-mkdir -pv grammars/resource/italian
-mkdir -pv grammars/resource/romance
-mkdir -pv grammars/resource/russian
-mkdir -pv grammars/resource/swedish
+rm -rf gf-grammars
+mkdir -pv gf-grammars
+mkdir -pv gf-grammars/letter
+# mkdir -pv gf-grammars/logic
+mkdir -pv gf-grammars/numerals
+mkdir -pv gf-grammars/prelude
+mkdir -pv gf-grammars/resource
+mkdir -pv gf-grammars/resource/abstract
+mkdir -pv gf-grammars/resource/english
+mkdir -pv gf-grammars/resource/finnish
+mkdir -pv gf-grammars/resource/french
+mkdir -pv gf-grammars/resource/german
+mkdir -pv gf-grammars/resource/italian
+mkdir -pv gf-grammars/resource/romance
+mkdir -pv gf-grammars/resource/russian
+mkdir -pv gf-grammars/resource/swedish
 
-cp -pv letter/README grammars/letter/
-cp -pv letter/mkLetter.gfs grammars/letter/
-cp -pv letter/*.gf grammars/letter/
+cp -pv letter/README gf-grammars/letter/
+cp -pv letter/mkLetter.gfs gf-grammars/letter/
+cp -pv letter/*.gf gf-grammars/letter/
 
-# cp -pv logic/*.gf grammars/logic/
+# cp -pv logic/*.gf gf-grammars/logic/
 
-cp -pv newnumerals/README grammars/numerals/
-cp -pv newnumerals/*.gf grammars/numerals/
-cp -pv newnumerals/mkNumerals.gfs grammars/numerals/
+cp -pv newnumerals/README gf-grammars/numerals/
+cp -pv newnumerals/*.gf gf-grammars/numerals/
+cp -pv newnumerals/mkNumerals.gfs gf-grammars/numerals/
 
-cp -pv prelude/*.gf grammars/prelude/
+cp -pv prelude/*.gf gf-grammars/prelude/
 
-cp -pv newresource/mkTest.gf grammars/resource/
-cp -pv newresource/mkParadigms.gf grammars/resource/
-cp -pv newresource/README grammars/resource/
-cp -pv newresource/abstract/*.gf grammars/resource/abstract/
-cp -pv newresource/english/*.gf grammars/resource/english/
-cp -pv newresource/finnish/*.gf grammars/resource/finnish/
-cp -pv newresource/french/*.gf grammars/resource/french/
-cp -pv newresource/german/*.gf grammars/resource/german/
-cp -pv newresource/italian/*.gf grammars/resource/italian/
-cp -pv newresource/romance/*.gf grammars/resource/romance/
-cp -pv newresource/russian/*.gf grammars/resource/russian/
-cp -pv newresource/swedish/*.gf grammars/resource/swedish/
+cp -pv newresource/mkTest.gfs gf-grammars/resource/
+cp -pv newresource/mkParadigms.gfs gf-grammars/resource/
+cp -pv newresource/README gf-grammars/resource/
+cp -pv newresource/abstract/*.gf gf-grammars/resource/abstract/
+cp -pv newresource/english/*.gf gf-grammars/resource/english/
+cp -pv newresource/finnish/*.gf gf-grammars/resource/finnish/
+cp -pv newresource/french/*.gf gf-grammars/resource/french/
+cp -pv newresource/german/*.gf gf-grammars/resource/german/
+cp -pv newresource/italian/*.gf gf-grammars/resource/italian/
+cp -pv newresource/romance/*.gf gf-grammars/resource/romance/
+cp -pv newresource/russian/*.gf gf-grammars/resource/russian/
+cp -pv newresource/swedish/*.gf gf-grammars/resource/swedish/
+
+tar cvfz gf-grammars.tgz gf-grammars
diff --git a/grammars/tst.sh b/grammars/tst.sh
new file mode 100644
index 000000000..b317bd1cd
--- /dev/null
+++ b/grammars/tst.sh
@@ -0,0 +1,15 @@
+cd gf-grammars/numerals
+gf <mkNumerals.gfs
+echo "x=56789" | gft numerals.gfcm
+rm numerals.gfcm
+cd ../letter
+gf <mkLetter.gfs
+jgf Letter.gfcm
+rm -f Letter.gfcm
+cd ../resource
+gf <mkTest.gfs
+gf <mkParadigms.gfs
+jgf TestAll.gfcm
+rm -f */*.gfc */*.gfr
+rm -f ../prelude/*.gfc ../prelude/*.gfr
+rm -f TestAll.gfcm
diff --git a/lib/resource-0.6/README b/lib/resource-0.6/README
index 1517d710f..4b4b62382 100644
--- a/lib/resource-0.6/README
+++ b/lib/resource-0.6/README
@@ -49,5 +49,7 @@ Missing structures
   " "the house that he wants to buy"
 
 
+opyright (c) 2001-2004 Janna Khegai, Aarne Ranta
+under GNU General Public License (GPL).
 
 Document last updated August 3, 2004, by Aarne Ranta.
diff --git a/lib/resource-0.6/finnish/SyntaxFin.gf b/lib/resource-0.6/finnish/SyntaxFin.gf
index b01af5b27..7798b5543 100644
--- a/lib/resource-0.6/finnish/SyntaxFin.gf
+++ b/lib/resource-0.6/finnish/SyntaxFin.gf
@@ -114,7 +114,7 @@ oper
            f => pron.s ! npForm2PForm f 
            } ; 
      n = pron.n ; 
-     p = NP3
+     p = NPP pron.p
     } ;
 
 -- *Partitive noun phrases* use the partitive instead of the nominative
@@ -136,7 +136,7 @@ oper
     in
     {s = \\c => meihin.s ! c ++ kaksi.s ! c ; 
      n = me.n ; 
-     p = NP3     -- meidän kahden talo (*talomme)
+     p = NPP me.p  --- meidän kahden talo (*talomme)
     } ;
 
   noNum : Numeral = {s = \\_ => [] ; isNum = False} ;