diff --git a/.gitignore b/.gitignore
index 2a4ca61c..7b634ed0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ src/version.c
 .cproject
 .project
 .settings
-data/dvb-scan
 
 *.pyc
 .*.sw[op]
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..c5d345fa
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "data/dvb-scan"]
+	path = data/dvb-scan
+	url = git://linuxtv.org/dtv-scan-tables.git
diff --git a/configure b/configure
index 267187ab..f4a5193e 100755
--- a/configure
+++ b/configure
@@ -147,24 +147,6 @@ if enabled_or_auto inotify; then
   fi
 fi
 
-#
-# DVB scan
-#
-if enabled linuxdvb && enabled dvbscan; then
-  if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then
-    if ! enabled bin_bzip2; then
-      die "Bzip2 not found, fetch dvb-scan files (use --disable-dvbscan)"
-    fi
-    echo -n "Fetching dvb-scan files... "
-    if ${ROOTDIR}/support/getmuxlist &> /dev/null; then
-      echo "done"
-    else
-      echo
-      die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)"
-    fi
-  fi
-fi
-
 #
 # libdvbcsa
 #
diff --git a/data/dvb-scan b/data/dvb-scan
new file mode 160000
index 00000000..c57839aa
--- /dev/null
+++ b/data/dvb-scan
@@ -0,0 +1 @@
+Subproject commit c57839aad2260306e6adecc0058fb683a8b34bc4