diff --git a/expat/Makefile b/expat/Makefile
index bb3dc996..0a0ce59f 100755
--- a/expat/Makefile
+++ b/expat/Makefile
@@ -3,8 +3,8 @@ CFLAGS=-O2 -I. -Ixmlparse
 # Use one of the next two lines; unixfilemap is better if it works.
 FILEMAP_OBJ=xmlwf/unixfilemap.o
 #FILEMAP_OBJ=xmlwf/readfilemap.o
-OBJS=xmltok.o \
-  xmlrole.o \
+OBJS=xmltok/xmltok.o \
+  xmltok/xmlrole.o \
   xmlwf/xmlwf.o \
   xmlparse/xmlparse.o \
   xmlparse/hashtable.o \
@@ -19,14 +19,14 @@ xmlwf/xmlwf$(EXE): $(OBJS)
 clean:
 	rm -f $(OBJS) xmlwf/xmlwf$(EXE)
 
-nametab.h: gennmtab/gennmtab$(EXE)
+xmltok/nametab.h: gennmtab/gennmtab$(EXE)
 	rm -f $@
 	gennmtab/gennmtab$(EXE) >$@
 
 gennmtab/gennmtab$(EXE): gennmtab/gennmtab.c
 	$(CC) $(CFLAGS) -o $@ gennmtab/gennmtab.c
 
-xmltok.o: nametab.h
+xmltok/xmltok.o: xmltok/nametab.h
 
 .c.o:
 	$(CC) $(CFLAGS) -c -o $@ $<