diff --git a/examples/pdb/xml/ChangeLog b/examples/pdb/xml/ChangeLog
deleted file mode 100644
index e44fa3bd30f..00000000000
--- a/examples/pdb/xml/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-** This file is now deprecated - use CVS' log features **
-
-2002-06-13 Jelmer Vernooij <jelmer@samba.org>
- * Use SID's instead of RID's (just like samba-HEAD CVS)
- * Released 1.1
-
-2002-05-26 Jelmer Vernooij <jelmer@samba.org>
- * Update read support (didn't support all elements yet)
- * Released 1.0
-
-2002-05-26 Jelmer Vernooij <jelmer@samba.org>
- * Initial release
- * Released 0.5
diff --git a/examples/pdb/xml/Makefile.in b/examples/pdb/xml/Makefile.in
deleted file mode 100644
index 252641da6d3..00000000000
--- a/examples/pdb/xml/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-PDB_OBJS	= pdb_xml.so 
-PDB_CFLAGS	= `xml2-config --cflags`
-PDB_LDFLAGS	= `xml2-config --libs`
-
-CC		= @CC@
-LIBTOOL		= libtool
-CFLAGS		= @CFLAGS@ $(PDB_CFLAGS)
-CPPFLAGS	= @CPPFLAGS@ $(PDB_CPPFLAGS)
-LDFLAGS		= @LDFLAGS@ $(PDB_LDFLAGS)
-LDSHFLAGS	= -shared
-srcdir		= @builddir@
-FLAGS		=  $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
-
-# Default target
-
-default: $(PDB_OBJS)
-
-# Pattern rules
-
-%.so: %.lo
-	$(LIBTOOL) $(CC) $(LDSHFLAGS) $(LDFLAGS) -o $@ $< 
-
-%.lo: %.c
-	$(LIBTOOL) $(CC) $(FLAGS) -c $<
-
-# Misc targets
-
-clean:
-	rm -rf .libs
-	rm -f core *~ *% *.bak \
-	$(PDB_OBJS) $(PDB_OBJS:.so=.o) $(PDB_OBJS:.so=.lo) 
diff --git a/examples/pdb/xml/README b/examples/pdb/xml/README
deleted file mode 100644
index afb08fdb4fa..00000000000
--- a/examples/pdb/xml/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Readme for samba pdb xml 0.5
---
-This module requires libxml2 to be installed.
-
-The usage of pdb_xml is pretty straightforward. To export data, use:
-
-pdbedit -e plugin:/usr/lib/samba/pdb_xml.so:filename
-
-(where filename is the name of the file to put the data in)
-To import data, use:
-
-pdbedit -i plugin:/usr/lib/samba/pdb_xml.so:filename -e <current-pdb>
-
-Where filename is the name to read the data from and <current-pdb> to put it in.
diff --git a/examples/pdb/xml/TODO b/examples/pdb/xml/TODO
deleted file mode 100644
index 3947bb68be1..00000000000
--- a/examples/pdb/xml/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-- Be faster. Don't rewrite the whole file when adding a user, but store
-  it in the memory and save it when exiting. Requires changes to samba source.
-  Gives the ability to read/write to standard input/output
-- Do locking!
-- Better names!
-- Support stdin ?
diff --git a/examples/pdb/xml/pdb_xml.c b/source/passdb/pdb_xml.c
similarity index 98%
rename from examples/pdb/xml/pdb_xml.c
rename to source/passdb/pdb_xml.c
index a8b26d6f5f3..27f0b12a5ee 100644
--- a/examples/pdb/xml/pdb_xml.c
+++ b/source/passdb/pdb_xml.c
@@ -19,7 +19,14 @@
  * Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* FIXME: Support stdin input by using '-' */
+/* FIXME: 
+ * - Support stdin input by using '-'
+ * - Be faster. Don't rewrite the whole file when adding a user, but store it in the memory and save it when exiting. Requires changes to samba source.
+ * - Gives the ability to read/write to standard input/output
+ * - Do locking!
+ * - Better names!
+ */
+
 
 #define XML_URL "http://www.samba.org/ns"