--- a/expat/Makefile.in	2002-10-09 16:17:21.000000000 -0500
+++ a/expat/Makefile.in	2009-01-24 15:06:04.000000000 -0600
@@ -31,14 +31,10 @@ 
 
 Tclexpat_SOURCES	=	\
 		tclexpat.c	\
-		xmltok.c	\
-		xmlrole.c	\
-		xmlwf.c		\
 		xmlfile.c	\
 		codepage.c	\
 		hashtable.c	\
 		$(FILEMAP).c	\
-		xmlparse.c	\
 		@EXTRA_SOURCES@
 
 WIN_SOURCES	= 
@@ -143,8 +139,8 @@ 
 RANLIB		= @RANLIB@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_LD	= @SHLIB_LD@
-SHLIB_LDFLAGS	= @SHLIB_LDFLAGS@
-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+SHLIB_LDFLAGS	= @SHLIB_LDFLAGS@ $(LDFLAGS)
+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lexpat
 STLIB_LD	= @STLIB_LD@
 TCL_DEFS	= @TCL_DEFS@
 TCL_BIN_DIR	= @TCL_BIN_DIR@
@@ -230,7 +226,7 @@ 
 install-libraries: libraries
 	@mkdir -p $(DESTDIR)$(includedir)
 	@echo "Installing header files in $(DESTDIR)$(includedir)"
-	@for i in $(GENERIC_HDRS) ; do \
+	@for i in ; do \
 	    echo "Installing $$i" ; \
 	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
 	done;
--- a/expat/xmlwf/xmlfile.c	2000-12-28 05:49:46.000000000 -0600
+++ a/expat/xmlwf/xmlfile.c	2009-01-24 12:21:14.000000000 -0600
@@ -33,7 +33,7 @@ 
 #include <stddef.h>
 #include <string.h>
 #include <fcntl.h>
-#include "xmlparse.h"
+#include <expat.h>
 #include "xmlfile.h"
 #include "xmltchar.h"
 #include "filemap.h"
--- a/expat/xmlwf/xmlwf.c	2000-12-28 05:49:46.000000000 -0600
+++ a/expat/xmlwf/xmlwf.c	2009-01-24 12:09:57.000000000 -0600
@@ -33,7 +33,7 @@ 
 #include <stddef.h>
 #include <string.h>
 
-#include "xmlparse.h"
+#include <expat.h>
 #include "codepage.h"
 #include "xmlfile.h"
 #include "xmltchar.h"
--- a/tclexpat.c	2002-10-14 22:37:05.000000000 -0500
+++ a/tclexpat.c	2009-01-24 14:56:08.000000000 -0600
@@ -20,7 +20,7 @@ 
 
 #include <tcl.h>
 #include "tclxml.h"
-#include <xmlparse.h>
+#include <expat.h>
 
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLEXPORT
@@ -467,7 +467,16 @@ 
 	  return TCL_ERROR;
 	}
 	
+	/*
+	 * This method is not exported, so kludge around it by calling one of the
+	 * SetDefaultHandler* functions that also sets the variable to the desired
+	 * value.
         XML_SetDefaultExpandInternalEntities(expat->parser, bool);
+	 */
+	if (bool)
+	  XML_SetDefaultHandlerExpand(expat->parser, TclExpatDefaultHandler);
+	else
+	  XML_SetDefaultHandler(expat->parser, TclExpatDefaultHandler);
 
 	break;