diff --git a/makefile b/makefile
index ada3a08..bb8e4b8 100644
--- a/makefile
+++ b/makefile
@@ -20,15 +20,17 @@ AFFIXFILE= gaeilge.aff
 ALTAFFIXFILE=gaeilgemor.aff
 INSTALL_DATA=$(INSTALL) -m 444
 
-SORT=sort -u
+SORT=/usr/bin/sort -u
 
-all: ga_IE.dic
+hashtable: $(INSTALLATION).hash
+
+all: gaeilge.hash gaeilgelit.hash gaeilgemor.hash
 
 # grep -v filters out Malmö, São, LC_ALL=C needed!
-ga_IE.dic: $(RAWWORDS) $(AFFIXFILE) $(PERSONAL)
+gaeilge.hash: $(RAWWORDS) $(AFFIXFILE) $(PERSONAL)
 	LC_ALL=C $(SORT) $(RAWWORDS) $(PERSONAL) | LC_ALL=C grep -v "[^'a-zA-ZáéíóúÁÉÍÓÚ/-]" | iconv -f UTF-8 -t iso-8859-1 > gaeilge.focail
-	wc -l gaeilge.focail | cut -d ' ' -f 1 > ga_IE.dic
-	LC_ALL=C $(SORT) -f -t / --key 1,1 gaeilge.focail >> ga_IE.dic
+	iconv -f UTF-8 -t iso-8859-1 $(AFFIXFILE) > tempaff.txt
+	$(ISPELLBIN)/buildhash gaeilge.focail tempaff.txt gaeilge.hash
 	rm -f gaeilge.focail tempaff.txt
 
 gaeilgelit.hash: $(RAWWORDS) $(LITWORDS) gaeilgelit.aff $(PERSONAL)