diff --git a/src/Makefile b/src/Makefile
index 7e0fd1c2a..53defcaeb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,38 +31,54 @@ api:
 
 dict: DictBul DictEng DictEst DictFin DictFre DictRus DictGer DictSwe
 
-DictBul:
+initdict: 
+	@mkdir -p ../dict/
+
+DictBul: initdict
 	gf -batch bulgarian/DictBul.gf +RTS -K100M
-	cp -p bulgarian/DictBul*.gfo ../alltenses
+	cp -p bulgarian/DictBul*.gfo ../dict/
 
-DictEng:
+DictEng: initdict
 	gf -batch english/DictEng.gf +RTS -K100M
-	cp -p english/DictEng*.gfo ../alltenses
+	cp -p english/DictEng*.gfo ../dict
 
-DictEst:
-	gf -batch estonian/DictEst.gf +RTS -K100M
-	cp -p estonian/DictEst*.gfo ../alltenses
+DictEst: initdict
+	gf -batch estonian/DictEst.gf +RTS -K200M
+	cp -p estonian/DictEst*.gfo ../dict
 
-DictFin:
+DictFin: initdict
 	gf -batch finnish/DictFin.gf +RTS -K100M
-	cp -p finnish/DictFin*.gfo ../alltenses
+	cp -p finnish/DictFin*.gfo ../dict
 
-DictFre:
-	gf -batch french/DictFre.gf +RTS -K100M
-	cp -p french/DictFre*.gfo ../alltenses
+DictFre: initdict
+	-gf -batch french/DictFre.gf +RTS -K100M
+	-cp -p french/DictFre*.gfo ../dict
 
-DictGer:
+DictGer: initdict
 	gf -batch german/DictGer.gf +RTS -K100M
-	cp -p german/DictGer*.gfo ../alltenses
+	cp -p german/DictGer*.gfo ../dict
 
-DictRus:
-	gf -batch russian/DictRus.gf +RTS -K100M
-	cp -p russian/DictRus*.gfo ../alltenses
+DictRus: initdict
+	gf -batch russian/DictRus.gf +RTS -K200M
+	cp -p russian/DictRus*.gfo ../dict
 
-DictSwe:
+DictSwe: initdict
 	gf -batch swedish/DictSwe.gf +RTS -K100M
-	cp -p swedish/DictSwe*.gfo ../alltenses
+	cp -p swedish/DictSwe*.gfo ../dict
 
+GFMKD=gf -s -batch -make -literal=PN -gfo-dir ../dict
+DictBul.pgf: initdict ;  $(GFMKD) -name=DictBul bulgarian/DictBul.gf +RTS -K100M
+DictEng.pgf: initdict ;  $(GFMKD) -name=DictEng english/DictEng.gf   +RTS -K100M
+DictEst.pgf: initdict ;  $(GFMKD) -name=DictEst estonian/DictEst.gf  +RTS -K200M
+DictFin.pgf: initdict ;  $(GFMKD) -name=DictFin finnish/DictFin.gf   +RTS -K100M
+DictFre.pgf: initdict ; -$(GFMKD) -name=DictFre french/DictFre.gf    +RTS -K100M
+DictGer.pgf: initdict ;  $(GFMKD) -name=DictGer german/DictGer.gf    +RTS -K100M
+DictHin.pgf: initdict ; -$(GFMKD) -name=DictHin hindi/DictHinWSJ.gf  +RTS -K100M
+DictMlt.pgf: initdict ;  $(GFMKD) -name=DictMlt maltese/DictMlt.gf   +RTS -K100M 
+DictRus.pgf: initdict ;  $(GFMKD) -name=DictRus russian/DictRus.gf   +RTS -K200M
+DictSwe.pgf: initdict ;  $(GFMKD) -name=DictSwe swedish/DictSwe.gf   +RTS -K100M
+DictTur.pgf: initdict ;  $(GFMKD) -name=DictTur turkish/DictTur.gf   +RTS -K100M
+DictUrd.pgf: initdict ;  $(GFMKD) -name=DictUrd urdu/DictUrd.gf      +RTS -K100M
 
 # thai with pronunciation
 thp:
diff --git a/src/swedish/DictSweAbs.gf b/src/swedish/DictSweAbs.gf
index ea4dae1ba..286d15a73 100644
--- a/src/swedish/DictSweAbs.gf
+++ b/src/swedish/DictSweAbs.gf
@@ -4,4 +4,4 @@
 -- Original module by Malin Ahlberg has been moved to OldDictSwe (which this module inherits)
 -- This updated version with renamed identifiers is maintained by John J. Camilleri
 
-abstract DictSweAbs = Cat, OldDictSweAbs NewDictSweAbs ;
+abstract DictSweAbs = Cat, OldDictSweAbs, NewDictSweAbs ;