diff --git a/.gitignore b/.gitignore
index bba2cfd3..6b754dd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ config.default
 .cproject
 .project
 .settings
+data/dvb-scan
diff --git a/configure b/configure
index 651b9c37..78908cd9 100755
--- a/configure
+++ b/configure
@@ -44,6 +44,7 @@ enable cwc
 enable avahi
 enable linuxdvb
 enable v4l
+enable dvbscan
 
 for opt do
   optval="${opt#*=}"
@@ -185,6 +186,17 @@ else
     die
 fi
 
+#
+# DVB-scan files
+#
+if enabled dvbscan; then
+  if [ ! -d data/dvb-scan ]; then
+    echo -n "Fetching dvb-scan files... "
+    ${TOPDIR}/support/getmuxlist &> /dev/null
+    echo "done"
+  fi
+fi
+
 #
 # Finalize
 #
diff --git a/support/configure.inc b/support/configure.inc
index 5416be89..706ba9a0 100644
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -25,6 +25,7 @@ CONFIG_LIST="
  linuxdvb
  v4l
  execinfo
+ dvbscan
 "
 
 die() {