diff --git a/README b/README
index ba93e1fd..a146cd48 100644
--- a/README
+++ b/README
@@ -24,11 +24,11 @@ Build from git repo:
 
 Dump the current system keyboard layout into an XML file:
 
-  $ ./tests/eek-example-xml -d > keyboard.xml
+  $ ./src/eekboard-xml --dump > keyboard.xml
 
 Load the XML file and display a keyboard created from it:
 
-  $ ./tests/eek-example-xml -l keyboard.xml
+  $ ./src/eekboard-xml --load keyboard.xml
 
 Start D-Bus server:
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 48e116f9..32d2e732 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,11 @@
 # 02110-1301 USA
 
 if ENABLE_EEKBOARD
-bin_PROGRAMS = eekboard-system-client eekboard-client eekboard-server
+bin_PROGRAMS = \
+	eekboard-system-client \
+	eekboard-client \
+	eekboard-server \
+	eekboard-xml
 noinst_LIBRARIES = libeekboard.a
 
 libeekboard_a_headers = proxy.h
@@ -84,9 +88,26 @@ eekboard_client_LDADD = \
 
 eekboard_client_SOURCES = client-main.c
 
+eekboard_xml_CFLAGS = \
+	-I$(top_srcdir) \
+	$(GIO2_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(LIBXKLAVIER_CFLAGS)
+
+eekboard_xml_LDADD = \
+	$(top_builddir)/eek/libeek.la \
+	$(top_builddir)/eek/libeek-xkl.la \
+	$(top_builddir)/eek/libeek-gtk.la \
+	$(GIO2_LIBS) \
+	$(GTK_LIBS) \
+	$(LIBXKLAVIER_CFLAGS)
+
+eekboard_xml_SOURCES = xml-main.c
+
 noinst_HEADERS = \
 	$(libeekboard_a_headers) \
 	$(eekboard_system_client_headers) \
 	$(eekboard_client_headers) \
-	$(eekboard_server_headers)
+	$(eekboard_server_headers) \
+	$(eekboard_xml_headers)
 endif
diff --git a/tests/eek-example-xml.c b/src/xml-main.c
similarity index 100%
rename from tests/eek-example-xml.c
rename to src/xml-main.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b5ff0853..a25cafd5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,8 +19,7 @@
 INCLUDES = -I$(top_srcdir) $(GIO2_CFLAGS) $(GTK_CFLAGS) $(XKB_CFLAGS)
 
 TESTS = eek-simple-test eek-xkb-test eek-xml-test
-SAMPLES = eek-example-xml
-noinst_PROGRAMS = $(TESTS) $(SAMPLES)
+noinst_PROGRAMS = $(TESTS)
 
 eek_simple_test_SOURCES = eek-simple-test.c
 eek_simple_test_LDADD = $(top_builddir)/eek/libeek.la
@@ -30,6 +29,3 @@ eek_xkb_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xk
 
 eek_xml_test_SOURCES = eek-xml-test.c
 eek_xml_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkl.la
-
-eek_example_xml_SOURCES = eek-example-xml.c
-eek_example_xml_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkl.la $(top_builddir)/eek/libeek-gtk.la