diff --git a/expat/Makefile b/expat/Makefile
new file mode 100755
index 00000000..24db1694
--- /dev/null
+++ b/expat/Makefile
@@ -0,0 +1,34 @@
+CC=gcc
+CFLAGS=-O2 -I.
+# Use one of the next two lines; unixfilemap is better if it works.
+FILEMAP_OBJ=xmlwf/unixfilemap.o
+#FILEMAP_OBJ=xmlwf/readfilemap.o
+XMLWF_OBJS=xmltok.o \
+  xmlrole.o \
+  xmlwf/xmlwf.o \
+  xmlwf/wfcheck.o \
+  xmlwf/wfcheckmessage.o \
+  xmlwf/hashtable.o \
+  $(FILEMAP_OBJ)
+XMLEC_OBJS=xmltok.o xmlec/xmlec.o
+EXE=
+
+all: xmlwf xmlec
+
+xmlwf: $(XMLWF_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(XMLWF_OBJS)
+
+xmlec: $(XMLEC_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(XMLEC_OBJS)
+
+clean:
+	rm -f $(XMLWF_OBJS) xmlwf$(EXE) $(XMLEC_OBJS) xmlec$(EXE)
+
+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
diff --git a/expat/xmltok/iasciitab.h b/expat/xmltok/iasciitab.h
new file mode 100755
index 00000000..a3225fbd
--- /dev/null
+++ b/expat/xmltok/iasciitab.h
@@ -0,0 +1,33 @@
+/* Like asciitab.h, except that 0xD has code BT_S rather than BT_CR */
+/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x04 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x08 */ BT_NONXML, BT_S, BT_LF, BT_NONXML,
+/* 0x0C */ BT_NONXML, BT_S, BT_NONXML, BT_NONXML,
+/* 0x10 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x14 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x18 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x1C */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
+/* 0x20 */ BT_S, BT_EXCL, BT_QUOT, BT_NUM,
+/* 0x24 */ BT_OTHER, BT_PERCNT, BT_AMP, BT_APOS,
+/* 0x28 */ BT_LPAR, BT_RPAR, BT_AST, BT_PLUS,
+/* 0x2C */ BT_COMMA, BT_MINUS, BT_NAME, BT_SOL,
+/* 0x30 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT,
+/* 0x34 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT,
+/* 0x38 */ BT_DIGIT, BT_DIGIT, BT_NMSTRT, BT_SEMI,
+/* 0x3C */ BT_LT, BT_EQUALS, BT_GT, BT_QUEST,
+/* 0x40 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX,
+/* 0x44 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT,
+/* 0x48 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x4C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x50 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x54 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x58 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_LSQB,
+/* 0x5C */ BT_OTHER, BT_RSQB, BT_OTHER, BT_NMSTRT,
+/* 0x60 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX,
+/* 0x64 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT,
+/* 0x68 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x6C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x70 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x74 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
+/* 0x78 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER,
+/* 0x7C */ BT_VERBAR, BT_OTHER, BT_OTHER, BT_OTHER,