diff --git a/data/Makefile.am b/data/Makefile.am
index e40b54580..f2ee0347a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,8 +30,7 @@ config_DATA = \
 	settingsupdate.conf \
 	terrestrial.xml \
 	tobackup.conf \
-	webradio_usr.xml \
-	webtv_usr.xml
+	webradio_usr.xml
 
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit
diff --git a/data/webtv/Makefile.am b/data/webtv/Makefile.am
index 99103de5f..9ce9504f2 100644
--- a/data/webtv/Makefile.am
+++ b/data/webtv/Makefile.am
@@ -1,3 +1,7 @@
-installdir = $(WEBTVDIR)
+installdir = $(WEBTVDIR_VAR)
 
-install_DATA =
+install_DATA = \
+	webtv_usr.xml
+
+install-data-hook:
+	$(INSTALL) -d $(DESTDIR)/$(WEBTVDIR)
diff --git a/data/webtv_usr.xml b/data/webtv/webtv_usr.xml
similarity index 100%
rename from data/webtv_usr.xml
rename to data/webtv/webtv_usr.xml