diff --git a/configure.ac b/configure.ac
index 6e1812ce8..349e19778 100644
--- a/configure.ac
+++ b/configure.ac
@@ -376,6 +376,7 @@ data/y-web/images/Makefile
 data/y-web/languages/Makefile
 data/y-web/scripts/Makefile
 data/y-web/styles/Makefile
+data/zapit/Makefile
 lib/Makefile
 lib/connection/Makefile
 lib/hardware/coolstream/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index af644f4c4..ccf6328be 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,8 @@ SUBDIRS = \
 	themes \
 	webradio \
 	webtv \
-	y-web
+	y-web \
+	zapit
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
@@ -31,10 +32,3 @@ config_DATA = \
 	settingsupdate.conf \
 	terrestrial.xml \
 	tobackup.conf
-zapitdir = $(CONFIGDIR)/zapit
-
-zapit_DATA = \
-	myservices.xml
-
-#install-data-hook:
-#	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit
diff --git a/data/zapit/Makefile.am b/data/zapit/Makefile.am
new file mode 100644
index 000000000..2990531b8
--- /dev/null
+++ b/data/zapit/Makefile.am
@@ -0,0 +1,7 @@
+installdir = $(CONFIGDIR)/zapit
+
+install_DATA = \
+	myservices.xml
+
+#install-data-hook:
+#	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit
diff --git a/data/myservices.xml b/data/zapit/myservices.xml
similarity index 100%
rename from data/myservices.xml
rename to data/zapit/myservices.xml