diff -ur xmlrpc-epi-0.51.orig/configure.in xmlrpc-epi-0.51.patched/configure.in
--- xmlrpc-epi-0.51.orig/configure.in	2002-06-23 18:48:29.000000000 -0500
+++ xmlrpc-epi-0.51.patched/configure.in	2007-03-13 02:04:34.000000000 -0500
@@ -36,7 +36,7 @@
 
 AC_CHECK_FUNCS(mktime strstr)
 
-AC_OUTPUT(src/Makefile Makefile sample/Makefile expat/Makefile expat/xmltok/Makefile expat/xmlparse/Makefile)
+AC_OUTPUT(src/Makefile Makefile sample/Makefile)
 
 
 
diff -ur xmlrpc-epi-0.51.orig/Makefile.am xmlrpc-epi-0.51.patched/Makefile.am
--- xmlrpc-epi-0.51.orig/Makefile.am	2001-04-09 20:37:40.000000000 -0500
+++ xmlrpc-epi-0.51.patched/Makefile.am	2007-03-13 02:04:34.000000000 -0500
@@ -1,4 +1,4 @@
-SUBDIRS = expat src sample
+SUBDIRS = src sample
 
 CHANGE_LOG_GEN_BIN = scripts/cvs2cl.pl
 CHANGE_LOG_GEN_FLAGS = -t -r -b --accum -I ChangeLog --gmt --prune
diff -ur xmlrpc-epi-0.51.orig/sample/Makefile.am xmlrpc-epi-0.51.patched/sample/Makefile.am
--- xmlrpc-epi-0.51.orig/sample/Makefile.am	2001-08-31 16:38:27.000000000 -0500
+++ xmlrpc-epi-0.51.patched/sample/Makefile.am	2007-03-13 02:04:34.000000000 -0500
@@ -1,4 +1,4 @@
-INCLUDES=-I../src -I../expat/xmltok -I../expat/xmlparse
+INCLUDES=-I../src
 
 bin_PROGRAMS = sample client server server_compliance_test memtest hello_client hello_server
 
diff -ur xmlrpc-epi-0.51.orig/src/Makefile.am xmlrpc-epi-0.51.patched/src/Makefile.am
--- xmlrpc-epi-0.51.orig/src/Makefile.am	2001-09-16 15:27:27.000000000 -0500
+++ xmlrpc-epi-0.51.patched/src/Makefile.am	2007-03-13 02:08:37.000000000 -0500
@@ -1,8 +1,8 @@
-INCLUDES=-I../liblm -I../expat/xmltok -I../expat/xmlparse -I/usr/local/ssl/include 
+INCLUDES=-I../liblm
 
 lib_LTLIBRARIES = libxmlrpc.la
 
-libxmlrpc_la_LIBADD = ../expat/xmltok/libexpat_tok.la ../expat/xmlparse/libexpat_parse.la
+libxmlrpc_la_LIBADD = -lexpat
 
 libxmlrpc_la_SOURCES = \
 	base64.c \
diff -ur xmlrpc-epi-0.51.orig/src/xml_element.c xmlrpc-epi-0.51.patched/src/xml_element.c
--- xmlrpc-epi-0.51.orig/src/xml_element.c	2007-03-13 02:04:12.000000000 -0500
+++ xmlrpc-epi-0.51.patched/src/xml_element.c	2007-03-13 02:04:34.000000000 -0500
@@ -91,7 +91,7 @@
 
 #include "xml_element.h"
 #include "queue.h"
-#include "xmlparse.h"
+#include "expat.h"
 #include "encodings.h"
 
 #define my_free(thing)  if(thing) {free(thing); thing = 0;}
diff -ur xmlrpc-epi-0.51.orig/src/xmlrpc.c xmlrpc-epi-0.51.patched/src/xmlrpc.c
--- xmlrpc-epi-0.51.orig/src/xmlrpc.c	2002-03-09 17:15:44.000000000 -0600
+++ xmlrpc-epi-0.51.patched/src/xmlrpc.c	2007-03-13 02:04:34.000000000 -0500
@@ -120,7 +120,7 @@
 
 #include "queue.h"
 #include "xmlrpc.h"
-#include "xmlparse.h"
+#include "expat.h"
 #include "base64.h"
 
 #include "xml_to_xmlrpc.h"