diff --git a/configure.ac b/configure.ac
index 349e19778..7c9d289f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -329,6 +329,7 @@ AC_SUBST(BLURAY_LIBS)
 AC_OUTPUT([
 Makefile
 data/Makefile
+data/config/Makefile
 data/fonts/Makefile
 data/icons/Makefile
 data/icons/buttons/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index ccf6328be..0d9a5c5b9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
+	config \
 	fonts \
 	icons \
 	inetradio \
@@ -19,16 +20,3 @@ SUBDIRS = \
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
 endif
-
-configdir = $(CONFIGDIR)
-
-config_DATA = \
-	bad_package_pattern.list.sample \
-	cables.xml \
-	encoding.conf \
-	epglanguages.conf \
-	providermap.xml \
-	satellites.xml \
-	settingsupdate.conf \
-	terrestrial.xml \
-	tobackup.conf
diff --git a/data/config/Makefile.am b/data/config/Makefile.am
new file mode 100644
index 000000000..21f47ed77
--- /dev/null
+++ b/data/config/Makefile.am
@@ -0,0 +1,12 @@
+installdir = $(CONFIGDIR)
+
+install_DATA = \
+	bad_package_pattern.list.sample \
+	cables.xml \
+	encoding.conf \
+	epglanguages.conf \
+	providermap.xml \
+	satellites.xml \
+	settingsupdate.conf \
+	terrestrial.xml \
+	tobackup.conf
diff --git a/data/bad_package_pattern.list.sample b/data/config/bad_package_pattern.list.sample
similarity index 100%
rename from data/bad_package_pattern.list.sample
rename to data/config/bad_package_pattern.list.sample
diff --git a/data/cables.xml b/data/config/cables.xml
similarity index 100%
rename from data/cables.xml
rename to data/config/cables.xml
diff --git a/data/encoding.conf b/data/config/encoding.conf
similarity index 100%
rename from data/encoding.conf
rename to data/config/encoding.conf
diff --git a/data/epglanguages.conf b/data/config/epglanguages.conf
similarity index 100%
rename from data/epglanguages.conf
rename to data/config/epglanguages.conf
diff --git a/data/epgmap.xml b/data/config/epgmap.xml
similarity index 100%
rename from data/epgmap.xml
rename to data/config/epgmap.xml
diff --git a/data/mk_terrestrial_xml.pl b/data/config/mk_terrestrial_xml.pl
similarity index 100%
rename from data/mk_terrestrial_xml.pl
rename to data/config/mk_terrestrial_xml.pl
diff --git a/data/providermap.xml b/data/config/providermap.xml
similarity index 100%
rename from data/providermap.xml
rename to data/config/providermap.xml
diff --git a/data/satellites.xml b/data/config/satellites.xml
similarity index 100%
rename from data/satellites.xml
rename to data/config/satellites.xml
diff --git a/data/settingsupdate.conf b/data/config/settingsupdate.conf
similarity index 100%
rename from data/settingsupdate.conf
rename to data/config/settingsupdate.conf
diff --git a/data/terrestrial.xml b/data/config/terrestrial.xml
similarity index 100%
rename from data/terrestrial.xml
rename to data/config/terrestrial.xml
diff --git a/data/tobackup.conf b/data/config/tobackup.conf
similarity index 100%
rename from data/tobackup.conf
rename to data/config/tobackup.conf