diff --git a/configure.in b/configure.in
index 549e3080d5..21b655aa48 100644
--- a/configure.in
+++ b/configure.in
@@ -1251,7 +1251,6 @@ AC_OUTPUT(
   plugins/rudp/Makefile
   plugins/stats_tree/Makefile
   plugins/v5ua/Makefile
-  plugins/xml/Makefile
   tools/Makefile
   tools/lemon/Makefile
   ,)
diff --git a/epan/Makefile.common b/epan/Makefile.common
index b2fd686aaf..2f20c4c08d 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -76,6 +76,7 @@ LIBETHEREAL_SRC = 		\
 	tap.c			\
 	timestamp.c		\
 	to_str.c		\
+	tvbparse.c		\
 	tvbuff.c		\
 	value_string.c		\
 	xdlc.c			\
@@ -145,6 +146,7 @@ LIBETHEREAL_INCLUDES = 		\
 	tap.h			\
 	timestamp.h    		\
 	to_str.h		\
+	tvbparse.h		\
 	tvbuff.h		\
 	value_string.h		\
 	xdlc.h			\
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index a51308549f..ebd9206122 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -612,6 +612,7 @@ DISSECTOR_SRC =	\
 	packet-x509if.c	\
 	packet-x509sat.c	\
 	packet-xdmcp.c	\
+	packet-xml.c	\
 	packet-xot.c	\
 	packet-xyplex.c	\
 	packet-yhoo.c	\
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 5f824d0bee..e4c4da5825 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -44,8 +44,7 @@ SUBDIRS = \
 	rtnet \
 	rudp \
 	stats_tree \
-	v5ua \
-	xml
+	v5ua
 
 
 plugindir = @plugindir@
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index e78f4948a2..8e141c105c 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -29,8 +29,7 @@ all: \
 	rtnet \
 	rudp \
 	stats_tree \
-	v5ua \
-	xml
+	v5ua
 
 
 acn:: 
@@ -147,11 +146,6 @@ v5ua::
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
-xml:: 
-	cd xml
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
-	cd ..
-
 clean:
 	rm -rf $(VERSION)
 	cd acn
@@ -200,8 +194,6 @@ clean:
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../v5ua
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-	cd ../xml
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..
 
 distclean: clean
@@ -251,8 +243,6 @@ distclean: clean
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../v5ua
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
-	cd ../xml
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ..
 
 maintainer-clean: distclean
@@ -300,8 +290,6 @@ maintainer-clean: distclean
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../v5ua
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
-	cd ../xml
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ..
 
 ################################################################################
@@ -336,7 +324,6 @@ install-plugins:
 	xcopy rudp\*.dll $(VERSION) /d
 	xcopy stats_tree\*.dll $(VERSION) /d
 	xcopy v5ua\*.dll $(VERSION) /d
-	xcopy xml\*.dll $(VERSION) /d
 !ENDIF
 
 clean-deps: