Imported Upstream version 1.1.1+rev1457upstream/1.1.1+rev1457

author: etobi <git@e-tobi.net> 2013-09-03 09:48:47 +0200
committer: etobi <git@e-tobi.net> 2013-09-03 09:48:47 +0200
commit: 76c08672bc6c2984ebd7045a71862099890c9118 (patch)
tree: 31e3232493a151138c510886eb97ad4362623357
parent: 9fe4d4ea9c054e539ab679ed2e9c076c35beb69d (diff)
download: linux-dvb-apps-75969ecb28bdd717fd01eb0f484889d8225408c2.tar.gz
373 files changed, 3502 insertions, 3363 deletions
diff --git a/.hg_archival.txt b/.hg_archival.txt
index 51d57ab..153c681 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,2 +1,5 @@
 repo: d9fe7e17226f8e321aa80a015fc8d53f33b265d7
-node: 7de0663facd92bbb9049aeeda3dcba9601228f30
+node: bec11f78be51183f251c9942fda31f1380396b61
+branch: default
+latesttag: null
+latesttagdistance: 1458
diff --git a/lib/libdvben50221/en50221_stdcam_llci.c b/lib/libdvben50221/en50221_stdcam_llci.c
index 2266bbf..b6ffad4 100644
--- a/lib/libdvben50221/en50221_stdcam_llci.c
+++ b/lib/libdvben50221/en50221_stdcam_llci.c
@@ -374,14 +374,21 @@ static int llci_session_callback(void *arg, int reason, uint8_t _slot_id, uint16
 		} else if (resource_id == EN50221_APP_MMI_RESOURCEID) {
 			llci->stdcam.mmi_session_number = session_number;
 		}
-
 		break;
-    case S_SCALLBACK_REASON_CLOSE:
-        if (resource_id == EN50221_APP_MMI_RESOURCEID) {
-            llci->stdcam.mmi_session_number = -1;
-        }
 
-        break;
+	case S_SCALLBACK_REASON_CLOSE:
+		if (resource_id == EN50221_APP_MMI_RESOURCEID) {
+			llci->stdcam.mmi_session_number = -1;
+		} else if (resource_id == EN50221_APP_DATETIME_RESOURCEID) {
+			llci->datetime_session_number = -1;
+		} else if (resource_id == EN50221_APP_AI_RESOURCEID) {
+			llci->stdcam.ai_session_number = -1;
+		} else if (resource_id == EN50221_APP_CA_RESOURCEID) {
+			llci->stdcam.ca_session_number = -1;
+		} else if (resource_id == EN50221_APP_MMI_RESOURCEID) {
+			llci->stdcam.mmi_session_number = -1;
+		}
+		break;
 	}
 	return 0;
 }
diff --git a/test/Makefile b/test/Makefile
index 30cb9e3..4407d02 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,6 +10,7 @@ binaries = diseqc          \
            test_av         \
            test_av_play    \
            test_dvr        \
+           test_tapdmx     \
            test_dvr_play   \
            test_pes        \
            test_sec_ne     \
@@ -18,9 +19,10 @@ binaries = diseqc          \
            test_stillimage \
            test_tt         \
            test_vevent     \
+           test_video      \
 	   evtest	   \
-	   video	   \
-	   szap2
+	   szap2           \
+	   lock_s
 
 .PHONY: all
 
diff --git a/test/README b/test/README
index 2b39936..213ba71 100644
--- a/test/README
+++ b/test/README
@@ -47,4 +47,4 @@ test_dmx	:
 test_dvr	:
 test_front	:
 test_switch	:
-test_video	:
+test_video	: Play video-only file on /dev/dvb/adapter0/video0
diff --git a/test/lock_s.c b/test/lock_s.c
new file mode 100644
index 0000000..7bbab59
--- /dev/null
+++ b/test/lock_s.c
@@ -0,0 +1,531 @@
+/*
+ * lock_s - Ultra simple DVB-S lock test application
+ * A minimal lock test application derived from szap.c
+ * for testing purposes
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/poll.h>
+#include <sys/param.h>
+#include <fcntl.h>
+#include <time.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#include <stdint.h>
+#include <sys/time.h>
+
+#include <linux/dvb/frontend.h>
+
+#define FEDEVICE		"/dev/dvb/adapter%d/frontend%d"
+
+static char *usage_str = "\n lock_s ver:0.0.1: Simple utility to test DVB-S signal lock.\n"
+			 "     \n"
+			 "     usage: lock_s [[PARAMS] [OPTIONS]]\n"
+			 "       dvbstune [params] tune to user provided DVB-S parameters\n"
+			 "     -a number : use given adapter (default 0)\n"
+			 "     -f number : use given frontend (default 0)\n"
+			 "     -p params : parameters to be used for tuning\n"
+			 "	frequency (Mhz) Polarization (v/h) Symbol rate (MSPS)\n"
+			 "      \n"
+			 "     -s pos    : DiSEqC switch position\n"
+			 "     -H        : human readable output\n"
+			 "     -l lnb-type (DVB-S Only) (use -l help to print types) or \n"
+			 "     -l low[,high[,switch]] in Mhz\n";
+
+static char *univ_desc[] = {
+	"Europe",
+	"10800 to 11800 MHz and 11600 to 12700 Mhz",
+	"Dual LO, loband 9750, hiband 10600 MHz",
+	(char *)NULL
+};
+
+static char *dbs_desc[] = {
+	"Expressvu, North America",
+	"12200 to 12700 MHz",
+	"Single LO, 11250 MHz",
+	(char *)NULL
+};
+
+static char *standard_desc[] = {
+	"10945 to 11450 Mhz",
+	"Single LO, 10000 Mhz",
+	(char *)NULL
+};
+
+static char *enhan_desc[] = {
+	"Astra",
+	"10700 to 11700 MHz",
+	"Single LO, 9750 MHz",
+	(char *)NULL
+};
+
+static char *cband_desc[] = {
+	"Big Dish",
+	"3700 to 4200 MHz",
+	"Single LO, 5150 Mhz",
+	(char *)NULL
+};
+
+enum sec_bands {
+	SEC_LO_BAND	= 0,
+	SEC_HI_BAND	= 1,
+};
+
+struct sec_params {
+	unsigned int		freq;
+	enum fe_sec_voltage	voltage;
+	unsigned int		srate;
+
+	unsigned int		freq_if;
+	int			pos; /* DiSEqC sw. pos */
+
+	fe_sec_tone_mode_t	tone;
+	fe_sec_mini_cmd_t	burst;
+};
+
+struct lnb_types_st {
+	char	*name;
+	char	**desc;
+	unsigned long	low_val;
+	unsigned long	high_val;	/* zero indicates no hiband */
+	unsigned long	switch_val;	/* zero indicates no hiband */
+} lnbs[] = {
+	{"UNIVERSAL",	univ_desc,	9750,  10600, 11700 },
+ 	{"DBS",		dbs_desc, 	11250, 0,     0     },
+	{"STANDARD",	standard_desc,	10000, 0,     0     },
+	{"ENHANCED",	enhan_desc,	9750,  0,     0     },
+	{"C-BAND",	cband_desc,	5150,  0,     0     },
+};
+
+struct diseqc_cmd {
+	struct dvb_diseqc_master_cmd cmd;
+	uint32_t wait;
+};
+
+int lnb_parse(char *str, struct lnb_types_st *lnbp)
+{
+	int i;
+	char *cp, *np;
+
+	memset(lnbp, 0, sizeof (*lnbp));
+	cp = str;
+	while (*cp && isspace(*cp))
+		cp++;
+
+	if (isalpha(*cp)) {
+		for (i = 0; i < (int)(sizeof(lnbs) / sizeof(lnbs[0])); i++) {
+			if (!strcasecmp(lnbs[i].name, cp)) {
+				*lnbp = lnbs[i];
+				return 1;
+			}
+		}
+		return -1;
+	}
+
+	if (*cp == '\0' || !isdigit(*cp))
+		return -1;
+	lnbp->low_val = strtoul(cp, &np, 0);
+	if (lnbp->low_val == 0)
+		return -1;
+
+	cp = np;
+	while(*cp && (isspace(*cp) || *cp == ','))
+		cp++;
+	if (*cp == '\0')
+		return 1;
+	if (!isdigit(*cp))
+		return -1;
+	lnbp->high_val = strtoul(cp, &np, 0);
+
+	cp = np;
+	while(*cp && (isspace(*cp) || *cp == ','))
+		cp++;
+	if (*cp == '\0')
+		return 1;
+	if (!isdigit(*cp))
+		return -1;
+	lnbp->switch_val = strtoul(cp, NULL, 0);
+	return 1;
+}
+
+int params_decode(char *str, char **argv, struct sec_params *params)
+{
+	unsigned int freq;
+	char *pol;
+	char *cp, *np;
+
+	cp = str;
+
+	while (*cp && isspace(*cp))
+		cp++;
+
+	/* get frequency */
+	if (*cp == '\0' || !isdigit(*cp))
+		return -1;
+	freq = strtoul(cp, &np, 0);
+	params->freq = freq;
+	if (freq == 0)
+		return -1;
+
+	/* polarization v=13v:0, h=18v:0 */
+	pol = argv[optind]; /* v/h */
+	(!strncmp(pol, "v", 1)) ? (params->voltage = 0) : (params->voltage = 1);
+	params->srate = strtoul(argv[optind + 1], NULL, 0);
+
+	return 1;
+}
+
+/**
+ * lnb_setup(struct lnb_types_st *lnb, unsigned int freq, unsigned int *freq_if)
+ * @lnb		: lnb type as described int lnb_types_st
+ * @freq	: transponder frequency which user requests
+ * @freq_if	: resultant Intermediate Frequency after down conversion
+ */
+static int lnb_setup(struct lnb_types_st *lnb, struct sec_params *params)
+{
+	int ret = 0;
+
+	if (!lnb) {
+		fprintf(stderr, "Error: lnb_types=NULL\n");
+		ret = -EINVAL;
+		goto err;
+	}
+
+	/* TODO! check upper and lower limits from LNB types */
+	if (!params->freq) {
+		fprintf(stderr, "Error: invalid frequency, f:%d", params->freq);
+		ret = -EINVAL;
+		goto err;
+	}
+
+	if (lnb->switch_val && lnb->high_val && params->freq >= lnb->switch_val) {
+		/* HI Band */
+		params->freq_if	= params->freq - lnb->high_val;
+		params->tone	= SEC_TONE_ON;
+	} else {
+		/* LO Band */
+		params->tone	= SEC_TONE_OFF;
+		if (params->freq < lnb->low_val)
+			params->freq_if = lnb->low_val - params->freq;
+		else
+			params->freq_if = params->freq - lnb->low_val;
+
+	}
+err:
+	return ret;
+}
+
+static int diseqc_send_msg(int fd, struct sec_params *params, struct diseqc_cmd *cmd)
+{
+	int ret = 0;
+
+	ret = ioctl(fd, FE_SET_TONE, SEC_TONE_OFF);
+	if (ret < 0) {
+		fprintf(stderr, "FE_SET_TONE failed\n");
+		goto err;
+	}
+
+	ret = ioctl(fd, FE_SET_VOLTAGE, params->voltage);
+	if (ret < 0) {
+		fprintf(stderr, "FE_SET_VOLTAGE failed, voltage=%d\n", params->voltage);
+		usleep(15 * 1000);
+		goto err;
+	}
+
+	ret = ioctl(fd, FE_DISEQC_SEND_MASTER_CMD, &cmd->cmd);
+	if (ret < 0) {
+		perror("FE_DISEQC_SEND_MASTER_CMD failed");
+		usleep(cmd->wait * 1000);
+		usleep(15 * 1000);
+		goto err;
+	}
+
+	ret = ioctl(fd, FE_DISEQC_SEND_BURST, params->burst);
+	if (ret < 0) {
+		fprintf(stderr, "FE_DISEQC_SEND_BURST failed, burst=%d\n", params->burst);
+		usleep(15 * 1000);
+		goto err;
+	}
+
+	ret = ioctl(fd, FE_SET_TONE, params->tone);
+	if (ret < 0) {
+		fprintf(stderr, "FE_SET_TONE failed, tone=%d\n", params->tone);
+		goto err;
+	}
+err:
+	return ret;
+}
+
+static int diseqc_setup(int fd, struct sec_params *params)
+{
+	int pos				= params->pos;
+	int band			= params->tone;
+	fe_sec_voltage_t voltage	= params->voltage;
+	int ret;
+
+	struct diseqc_cmd cmd = {{{0xe0, 0x10, 0x38, 0xf0, 0x00, 0x00}, 4}, 0 };
+
+	/*
+	 * param: high nibble: reset bits, low nibble set bits,
+	 * bits are: option, position, polarization, band
+	 */
+	cmd.cmd.msg[3] =	 0xf0			|
+				(((pos * 4) & 0x0f)	|
+				(band ? 1 : 0)		|
+				(voltage ? 0 : 2));
+
+	ret = diseqc_send_msg(fd, params, &cmd);
+	if (ret < 0) {
+		fprintf(stderr, "SEC message send failed, err=%d", ret);
+		return -EIO;
+	}
+	return 0;
+}
+
+static int tune_to(int fd, struct sec_params *sec)
+{
+	struct dvb_frontend_parameters params;
+	struct dvb_frontend_event ev;
+	int ret;
+
+	/* discard stale QPSK events */
+	while (1) {
+		ret = ioctl(fd, FE_GET_EVENT, &ev);
+		if (ret == -1)
+			break;
+	}
+
+	params.frequency		= sec->freq_if;
+	params.inversion		= INVERSION_AUTO;
+	params.u.qpsk.symbol_rate	= sec->srate;
+	params.u.qpsk.fec_inner		= FEC_AUTO;
+
+	ret = ioctl(fd, FE_SET_FRONTEND, &params);
+	if (ret == -1) {
+		fprintf(stderr, "FE_SET_FRONTEND error=%d\n", ret);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int frontend_open(int *fd, int adapter, int frontend)
+{
+	static struct dvb_frontend_info info;
+	char fedev[128];
+	int ret = 0;
+
+	snprintf(fedev, sizeof(fedev), FEDEVICE, adapter, frontend);
+	*fd = open(fedev, O_RDWR | O_NONBLOCK);
+	if (*fd < 0) {
+		fprintf(stderr, "Frontend %d open failed\n", frontend);
+		ret = -1;
+		goto err;
+	}
+
+	ret = ioctl(*fd, FE_GET_INFO, &info);
+	if (ret < 0) {
+		fprintf(stderr, "ioctl FE_GET_INFO failed\n");
+		goto err;
+	}
+
+	if (info.type != FE_QPSK) {
+		fprintf(stderr, "frontend device is not a QPSK (DVB-S) device!\n");
+		ret = -ENODEV;
+		goto err;
+	}
+	return 0;
+err:
+	fprintf(stderr, "Closing Adapter:%d Frontend:%d\n", adapter, frontend);
+	close(*fd);
+	return ret;
+}
+
+void bad_usage(char *pname, int prlnb)
+{
+	int i;
+	struct lnb_types_st *lnb;
+	char **cp;
+
+	if (!prlnb) {
+		fprintf (stderr, usage_str, pname);
+	} else {
+		i = 0;
+		fprintf(stderr, "-l <lnb-type> or -l low[,high[,switch]] in Mhz\nwhere <lnb-type> is:\n");
+		while ((lnb = &lnbs[i]) != NULL) {
+			fprintf (stderr, "%s\n", lnb->name);
+			for (cp = lnb->desc; *cp; cp++)
+				fprintf (stderr, "   %s\n", *cp);
+			i++;
+		}
+	}
+}
+
+static int check_frontend (int fd, int human_readable)
+{
+	fe_status_t status;
+	uint16_t snr, signal;
+	uint32_t ber, uncorrected_blocks;
+	int ret;
+
+	do {
+		ret = ioctl(fd, FE_READ_STATUS, &status);
+		if (ret == -1) {
+			fprintf(stderr, "FE_READ_STATUS failed, err=%d", ret);
+			return -EIO;
+		}
+
+		/*
+		 * some frontends might not support all these ioctls, thus we
+		 * avoid printing errors
+		 */
+		ret = ioctl(fd, FE_READ_SIGNAL_STRENGTH, &signal);
+		if (ret == -1)
+			signal = -2;
+
+		ret = ioctl(fd, FE_READ_SNR, &snr);
+		if (ret == -1)
+			snr = -2;
+
+		ret = ioctl(fd, FE_READ_BER, &ber);
+		if (ret == -1)
+			ber = -2;
+
+		ret = ioctl(fd, FE_READ_UNCORRECTED_BLOCKS, &uncorrected_blocks);
+		if (ret == -1)
+			uncorrected_blocks = -2;
+
+		if (human_readable) {
+			printf ("status %02x | signal %3u%% | snr %3u%% | ber %d | unc %d | ",
+				status, (signal * 100) / 0xffff, (snr * 100) / 0xffff, ber, uncorrected_blocks);
+		} else {
+			printf ("status %02x | signal %04x | snr %04x | ber %08x | unc %08x | ",
+				status, signal, snr, ber, uncorrected_blocks);
+		}
+
+		if (status & FE_HAS_LOCK)
+			printf("FE_HAS_LOCK");
+
+		printf("\n");
+		usleep(1000000);
+	} while (1);
+
+	return 0;
+}
+
+
+/**
+ * basic options needed
+ * @adapter
+ * @frontend
+ * @freq (Mhz)
+ * @pol (13/18)
+ * @srate (kSps)
+ * @pos (0 - 3)
+ * @LNB (low, high, switch) Mhz
+ *
+ */
+int main(int argc, char *argv[])
+{
+	int opt;
+	int ret, fd, adapter=0, frontend=0, pos;
+	int simple;
+	struct lnb_types_st lnb;
+	struct sec_params sec;
+
+	lnb = lnbs[0]; /* default is Universal LNB */
+	while ((opt = getopt(argc, argv, "Hh:a:f:p:s:l:")) != -1) {
+		switch (opt) {
+		case '?':
+		case 'h':
+		default: /* help */
+			bad_usage(argv[0], 0);
+			break;
+		case 'a': /* adapter */
+			adapter = strtoul(optarg, NULL, 0);
+			break;
+		case 'f': /* demodulator (device) */
+			frontend = strtoul(optarg, NULL, 0);
+			break;
+		case 'p': /* parameters */
+			if (params_decode(optarg, argv, &sec) < 0) {
+				bad_usage(argv[0], 1);
+				return -1;
+			}
+			break;
+		case 's': /* diseqc position */
+			pos = strtoul(optarg, NULL, 0);
+			pos % 2 ? (sec.burst = SEC_MINI_B) : (sec.burst = SEC_MINI_A);
+			break;
+		case 'l':
+			if (lnb_parse(optarg, &lnb) < 0) {
+				bad_usage(argv[0], 1);
+				return -1;
+			}
+			break;
+		case 'H':
+			simple = 1; /* human readable */
+			break;
+		}
+	}
+	lnb.low_val	*= 1000; /* kHz */
+	lnb.high_val	*= 1000; /* kHz */
+	lnb.switch_val	*= 1000; /* kHz */
+
+	sec.freq *= 1000; /* kHz */
+	sec.srate *= 1000;
+
+	ret = frontend_open(&fd, adapter, frontend);
+	if (ret < 0) {
+		fprintf(stderr, "Adapter:%d Frontend:%d open failed, err=%d\n", adapter, frontend, ret);
+		return -1;
+	}
+	ret = lnb_setup(&lnb, &sec);
+	if (ret < 0) {
+		fprintf(stderr, "LNB setup failed, err=%d\n", ret);
+		fprintf(stderr, "%s", usage_str);
+		goto err;
+	}
+
+	ret = diseqc_setup(fd, &sec);
+	if (ret < 0) {
+		fprintf(stderr, "SEC setup failed, err=%d\n", ret);
+		goto err;;
+	}
+
+	ret = tune_to(fd, &sec);
+	if (ret < 0) {
+		fprintf(stderr, "Adapter:%d Frontend:%d tune_to %d %d failed, err=%d\n", adapter, frontend, sec.freq, sec.srate, ret);
+		goto err;;
+	}
+
+	ret = check_frontend(fd, 1);
+	if (ret < 0) {
+		fprintf(stderr, "check frontend failed\n");
+		goto err;;
+	}
+err:
+	return ret;
+}
diff --git a/test/test_tapdmx.c b/test/test_tapdmx.c
new file mode 100644
index 0000000..09bd0dc
--- /dev/null
+++ b/test/test_tapdmx.c
@@ -0,0 +1,160 @@
+/* test_tapdmx.c - Test recording a TS from the dmx device.
+ * very similar to test_dvr but using the new DMX_OUT_TSDEMUX_TAP
+ * usage: test_tapdmx PID [more PIDs...]
+ *
+ * test_dvr is
+ *   Copyright (C) 2003 convergence GmbH
+ *   Johannes Stezenbach <js@convergence.de>
+ * test_tapdmx conversion is
+ *   Copyright (C) 2011 B1 Systems GmbH
+ *   Stefan Seyfried <seife+dvb@b1-systems.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+//hm, I haven't tested writing large files yet... maybe it works
+#define _LARGEFILE64_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <inttypes.h>
+
+#include <linux/dvb/dmx.h>
+
+static unsigned long BUF_SIZE = 64 * 1024;
+static unsigned long long total_bytes;
+
+static void usage(void)
+{
+	fprintf(stderr, "usage: test_tapdmx file PID [more PIDs...]\n"
+			"       record a partial TS stream consisting of TS packets\n"
+			"       with the selected PIDs to the given file.\n"
+			"       Use PID 0x2000 to record the full TS stream (if\n"
+			"       the hardware supports it).\n"
+			"       The demux device used can be changed by setting\n"
+			"       the environment variable DEMUX.\n"
+			"       You can override the input buffer size by setting BUF_SIZE to\n"
+			"       the number of bytes wanted.\n"
+			"       Note: There is no output buffering, so writing to stdout is\n"
+			"       not really supported, but you can try something like:\n"
+			"       BUF_SIZE=188 ./test_tapdmx /dev/stdout 0 2>/dev/null | xxd\n"
+			"       ./test_tapdmx /dev/stdout 0x100 0x110 2>/dev/null| xine stdin://mpeg2\n"
+			"\n");
+	exit(1);
+}
+
+
+static void process_data(int dvrfd, int tsfd)
+{
+	uint8_t buf[BUF_SIZE];
+	int bytes, b2;
+
+	bytes = read(dvrfd, buf, sizeof(buf));
+	if (bytes < 0) {
+		perror("read");
+		if (errno == EOVERFLOW)
+			return;
+		fprintf(stderr, "exiting due to read() error\n");
+		exit(1);
+	}
+	total_bytes += bytes;
+	b2 = write(tsfd, buf, bytes);
+	if (b2 == -1) {
+		perror("write");
+		exit(1);
+	} else if (b2 < bytes)
+		fprintf(stderr, "warning: read %d, but wrote only %d bytes\n", bytes, b2);
+	else
+		fprintf(stderr, "got %d bytes (%llu total)\n", bytes, total_bytes);
+}
+
+int main(int argc, char *argv[])
+{
+	int dmxfd, tsfd;
+	unsigned int pid;
+	struct dmx_pes_filter_params f;
+	char *dmxdev = "/dev/dvb/adapter0/demux0";
+	int i;
+	char *chkp;
+
+	if (argc < 3)
+		usage();
+
+	if (getenv("DEMUX"))
+		dmxdev = getenv("DEMUX");
+
+	fprintf(stderr, "using '%s'\n"
+		"writing to '%s'\n", dmxdev, argv[1]);
+	tsfd = open(argv[1], O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, 0664);
+	if (tsfd == -1) {
+		perror("cannot write output file");
+		return 1;
+	}
+
+	dmxfd = open(dmxdev, O_RDONLY);
+	if (dmxfd == -1) {
+		perror("cannot open dmx device");
+		return 1;
+	}
+
+	if (getenv("BUF_SIZE") && ((BUF_SIZE = strtoul(getenv("BUF_SIZE"), NULL, 0)) > 0))
+		fprintf(stderr, "BUF_SIZE = %lu\n", BUF_SIZE);
+
+	pid = strtoul(argv[2], &chkp, 0);
+	if (pid > 0x2000 || chkp == argv[2])
+		usage();
+	fprintf(stderr, "adding filter for PID 0x%04x\n", pid);
+
+	memset(&f, 0, sizeof(f));
+	f.pid = (uint16_t) pid;
+	f.input = DMX_IN_FRONTEND;
+	f.output = DMX_OUT_TSDEMUX_TAP;
+	f.pes_type = DMX_PES_OTHER;
+
+	if (ioctl(dmxfd, DMX_SET_PES_FILTER, &f) == -1) {
+		perror("DMX_SET_PES_FILTER");
+		return 1;
+	}
+
+	for (i = 3; i < argc; i++) {
+		pid = strtoul(argv[i], &chkp, 0);
+		if (pid > 0x2000 || chkp == argv[i])
+			usage();
+		fprintf(stderr, "adding filter for PID 0x%04x\n", pid);
+		if (ioctl(dmxfd, DMX_ADD_PID, &pid) == -1) {
+			perror("DMX_ADD_PID");
+			return 1;
+		}
+	}
+	if (ioctl(dmxfd, DMX_START) == -1) {
+		perror("DMX_START");
+		close(dmxfd);
+		return 1;
+	}
+
+	for (;;) {
+		process_data(dmxfd, tsfd);
+	}
+
+	close(dmxfd);
+	return 0;
+}
diff --git a/test/test_video.c b/test/test_video.c
index ac66050..fe2f440 100644
--- a/test/test_video.c
+++ b/test/test_video.c
@@ -23,6 +23,7 @@
 
 #include <sys/ioctl.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -31,8 +32,7 @@
 #include <unistd.h>
 
 #include <linux/dvb/dmx.h>
-#include <linux/dvb/frontend_old.h>
-#include <linux/dvb/sec.h>
+#include <linux/dvb/frontend.h>
 #include <linux/dvb/video.h>
 #include <sys/poll.h>
 
@@ -100,7 +100,7 @@ int videoSelectSource(int fd, video_stream_source_t source)
 
 
 
-int videoSetBlank(int fd, boolean state)
+int videoSetBlank(int fd, int state)
 {
 	int ans;
 
@@ -138,72 +138,72 @@ int videoSlowMotion(int fd,int nframes)
 
 int videoGetStatus(int fd)
 {
-	struct video_status stat;
+	struct video_status vstat;
 	int ans;
 
-	if ((ans = ioctl(fd,VIDEO_GET_STATUS, &stat)) < 0) {
+	if ((ans = ioctl(fd,VIDEO_GET_STATUS, &vstat)) < 0) {
 		perror("VIDEO GET STATUS: ");
 		return -1;
 	}
 
 	printf("Video Status:\n");
 	printf("  Blank State          : %s\n",
-	       (stat.video_blank ? "BLANK" : "STILL"));
+	       (vstat.video_blank ? "BLANK" : "STILL"));
 	printf("  Play State           : ");
-	switch ((int)stat.play_state){
+	switch ((int)vstat.play_state){
 	case VIDEO_STOPPED:
-		printf("STOPPED (%d)\n",stat.play_state);
+		printf("STOPPED (%d)\n",vstat.play_state);
 		break;
 	case VIDEO_PLAYING:
-		printf("PLAYING (%d)\n",stat.play_state);
+		printf("PLAYING (%d)\n",vstat.play_state);
 		break;
 	case VIDEO_FREEZED:
-		printf("FREEZED (%d)\n",stat.play_state);
+		printf("FREEZED (%d)\n",vstat.play_state);
 		break;
 	default:
-		printf("unknown (%d)\n",stat.play_state);
+		printf("unknown (%d)\n",vstat.play_state);
 		break;
 	}
 
 	printf("  Stream Source        : ");
-	switch((int)stat.stream_source){
+	switch((int)vstat.stream_source){
 	case VIDEO_SOURCE_DEMUX:
-		printf("DEMUX (%d)\n",stat.stream_source);
+		printf("DEMUX (%d)\n",vstat.stream_source);
 		break;
 	case VIDEO_SOURCE_MEMORY:
-		printf("MEMORY (%d)\n",stat.stream_source);
+		printf("MEMORY (%d)\n",vstat.stream_source);
 		break;
 	default:
-		printf("unknown (%d)\n",stat.stream_source);
+		printf("unknown (%d)\n",vstat.stream_source);
 		break;
 	}
 
 	printf("  Format (Aspect Ratio): ");
-	switch((int)stat.video_format){
+	switch((int)vstat.video_format){
 	case VIDEO_FORMAT_4_3:
-		printf("4:3 (%d)\n",stat.video_format);
+		printf("4:3 (%d)\n",vstat.video_format);
 		break;
 	case VIDEO_FORMAT_16_9:
-		printf("16:9 (%d)\n",stat.video_format);
+		printf("16:9 (%d)\n",vstat.video_format);
 		break;
 	default:
-		printf("unknown (%d)\n",stat.video_format);
+		printf("unknown (%d)\n",vstat.video_format);
 		break;
 	}
 
 	printf("  Display Format       : ");
-	switch((int)stat.display_format){
+	switch((int)vstat.display_format){
 	case VIDEO_PAN_SCAN:
-		printf("Pan&Scan (%d)\n",stat.display_format);
+		printf("Pan&Scan (%d)\n",vstat.display_format);
 		break;
 	case VIDEO_LETTER_BOX:
-		printf("Letterbox (%d)\n",stat.display_format);
+		printf("Letterbox (%d)\n",vstat.display_format);
 		break;
 	case VIDEO_CENTER_CUT_OUT:
-		printf("Center cutout (%d)\n",stat.display_format);
+		printf("Center cutout (%d)\n",vstat.display_format);
 		break;
 	default:
-		printf("unknown (%d)\n",stat.display_format);
+		printf("unknown (%d)\n",vstat.display_format);
 		break;
 	}
 	return 0;
@@ -230,7 +230,6 @@ void play_file_video(int filefd, int fd)
 	int written;
 	struct pollfd pfd[NFD];
 	int stopped = 0;
-	int ch;
 
 	pfd[0].fd = STDIN_FILENO;
 	pfd[0].events = POLLIN;
@@ -327,7 +326,7 @@ void load_iframe(int filefd, int fd)
 	videoPlay(fd);
 }
 
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	int filefd;
@@ -338,7 +337,7 @@ main(int argc, char **argv)
 		perror("File open:");
 		return -1;
 	}
-	if ((fd = open("/dev/ost/video1",O_RDWR|O_NONBLOCK)) < 0){
+	if ((fd = open("/dev/dvb/adapter0/video0",O_RDWR|O_NONBLOCK)) < 0){
 		perror("VIDEO DEVICE: ");
 		return -1;
 	}
diff --git a/test/video.c b/test/video.c
deleted file mode 100644
index fae421e..0000000
--- a/test/video.c
+++ /dev/null
@@ -1,182 +0,0 @@
-#define USAGE \
-"\n" \
-"\n A tiny video watching application, just starts capturing /dev/video" \
-"\n into /dev/fb0." \
-"\n Be shure to have >8Bit/pixel color resolution and r/w access for " \
-"\n /dev/video0, /dev/fb0 and /dev/tty0 to let this work..." \
-"\n" \
-"\n  compile with" \
-"\n" \
-"\n  $ gcc -g -Wall -O2 -o video video.c -I../../ost/include" \
-"\n"
-
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <linux/fb.h>
-#include <linux/videodev.h>
-
-#define VIDEO_DEV "/dev/video0"
-#define FB_DEV "/dev/fb0"
-#define VT_DEV "/dev/tty0"
-
-static char *video_devname = VIDEO_DEV;
-
-#define min(a,b)	(a) < (b) ? (a) : (b)
-
-static int zero = 0;
-static int one = 1;
-
-static struct fb_var_screeninfo fb_var;
-static struct fb_fix_screeninfo fb_fix;
-
-
-int init_fb (void)
-{
-	const char blankoff_str[] = "\033[9;0]";
-	int fd, vt_fd;
-
-	fd = open (FB_DEV, O_RDWR);
-	if (fd < 0) {
-		perror("Could not open " FB_DEV ", please check permissions\n");
-		return 1;
-	}
-
-	if ((vt_fd = open( VT_DEV, O_RDWR )) < 0) {
-		perror("Could not open " VT_DEV ", please check permissions\n");
-		return 1;
-	}
-
-	write( vt_fd, blankoff_str, strlen(blankoff_str) );
-
-	if (ioctl (fd, FBIOGET_VSCREENINFO, &fb_var) < 0) {
-		perror("Could not get variable screen information (fb_var)\n");
-		return 1;
-	}
-
-	if (ioctl (fd, FBIOGET_FSCREENINFO, &fb_fix) < 0) {
-		perror("Could not get fixed screen information (fb_fix)\n");
-		return 1;
-	}
-
-	close (fd);
-	return 0;
-}
-
-
-int init_video (int stop)
-{
-	int fd;
-	struct video_capability vcap;
-
-	if ((fd = open (video_devname, O_RDWR)) < 0) {
-		fprintf (stderr,
-			 "%s: Could not open %s, please check permissions\n",
-			 __FUNCTION__, video_devname);
-		return -1;
-	}
-
-	ioctl(fd, VIDIOCGCAP, &vcap);
-
-	if (ioctl(fd, VIDIOCCAPTURE, &zero) < 0) {
-		perror("Could not stop capturing (VIDIOCCAPTURE failed)\n");
-		return -2;
-	}
-
-	if (stop)
-		return 0;
-
-	{
-		struct video_buffer b;
-		b.base = (void*) fb_fix.smem_start;
-		b.width = fb_var.xres;
-		b.height = fb_var.yres;
-		b.depth = fb_var.bits_per_pixel;
-		b.bytesperline = fb_var.xres*((fb_var.bits_per_pixel+7)/8);
-		if (ioctl(fd, VIDIOCSFBUF, &b) < 0) {
-			fprintf(stderr, "VIDIOCSFBUF failed, must run as root?\n");
-			return -3;
-		}
-	}
-
-	{
-		struct video_picture p;
-		if (ioctl(fd, VIDIOCGPICT, &p) < 0) {
-			perror("VIDIOCGPICT failed\n");
-			return -4;
-		}
-		p.depth = fb_var.bits_per_pixel;
-		switch (fb_var.bits_per_pixel) {
-			case 16:
-				p.palette = VIDEO_PALETTE_RGB565;
-				break;
-			case 24:
-				p.palette = VIDEO_PALETTE_RGB24;
-				break;
-			case 32:
-				p.palette = VIDEO_PALETTE_RGB32;
-				break;
-		}
-		//p.contrast = 0x8000;
-		//p.colour = 0x6000;
-		if (ioctl(fd, VIDIOCSPICT, &p) < 0) {
-			perror("VIDIOCSPICT failed\n");
-			return -5;
-		}
-	}
-
-	{
-		struct video_window win;
-		win.width = min((__u32) vcap.maxwidth, fb_var.xres);
-		win.height = min((__u32) vcap.maxheight, fb_var.yres);
-		win.x = 0;
-		win.y = 0;
-		win.flags = 0;
-		win.clips = NULL;
-		win.clipcount = 0;
-		win.chromakey = 0;
-		if (ioctl(fd, VIDIOCSWIN, &win) < 0) {
-			perror("VIDIOCSWIN failed\n");
-			return -6;
-		}
-	}
-
-	if (ioctl(fd, VIDIOCCAPTURE, &one) < 0) {
-		perror("Could not start capturing (VIDIOCCAPTURE failed)\n");
-		return -7;
-	}
-
-	close (fd);
-
-	return 0;
-}
-
-int main (int argc, char **argv)
-{
-	int err = 0, stop = 0;
-
-	if ((err = init_fb()))
-		return err;
-
-	if ((argc == 2 && strcmp(argv[1], "stop") == 0) ||
-	    (argc == 3 && strcmp(argv[2], "stop") == 0))
-		stop = 1;
-
-	if ((argc == 2 && !stop) || argc == 3)
-		video_devname = argv[1];
-
-	if (argc != 1 && argc != 2 && !(argc == 3 && stop)) {
-		fprintf(stderr, "usage: %s <devname> <stop>\n" USAGE, argv[0]);
-		exit (-1);
-	}
-
-	return init_video (stop);
-}
diff --git a/util/Makefile b/util/Makefile
index db9e63d..c78598c 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -18,3 +18,4 @@ all clean install:
 	$(MAKE) -C gnutv $@
 	$(MAKE) -C gotox $@
 	$(MAKE) -C zap $@
+	$(MAKE) -C lsdvb $@
diff --git a/util/atsc_epg/atsc_epg.c b/util/atsc_epg/atsc_epg.c
index 55e266d..288c42b 100644
--- a/util/atsc_epg/atsc_epg.c
+++ b/util/atsc_epg/atsc_epg.c
@@ -644,6 +644,8 @@ static int parse_events(struct atsc_channel_info *curr_info,
 		}
 
 		title = atsc_eit_event_name_title_text(e);
+		if (title == NULL)
+			continue;
 		atsc_text_strings_for_each(title, str, j) {
 			struct atsc_text_string_segment *seg;
 
diff --git a/util/lsdvb/Makefile b/util/lsdvb/Makefile
new file mode 100644
index 0000000..1e94162
--- /dev/null
+++ b/util/lsdvb/Makefile
@@ -0,0 +1,11 @@
+# Makefile for linuxtv.org dvb-apps/util/lsdvb
+
+binaries = lsdvb
+
+inst_bin = $(binaries)
+
+.PHONY: all
+
+all: $(binaries)
+
+include ../../Make.rules
diff --git a/util/lsdvb/lsdvb.c b/util/lsdvb/lsdvb.c
new file mode 100644
index 0000000..7a206aa
--- /dev/null
+++ b/util/lsdvb/lsdvb.c
@@ -0,0 +1,323 @@
+/*
+ * lsdvb - list PCI DVB devices
+ *
+ * Copyright (C) 2010 Manu Abraham <abraham.manu@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include <linux/dvb/frontend.h>
+
+#define DVB_DIR			"/dev/dvb"
+#define DVB_DEV_DIR		"/dev/dvb"
+#define DVB_SYSFS_DIR		"/sys/class/dvb"
+
+/**
+ * DVB sysfs entries are found thus:
+ * /sys/class/dvb/dvb0.frontend0/device/dvb/dvb0.frontend0/uevent for DVB_ADAPTER_NUM, DVB_DEVICE_NUM
+ *
+ * /sys/class/dvb/dvb0.frontend0/device/device for PCI_DEVICE_ID
+ * /sys/class/dvb/dvb0.frontend0/device/vendor for PCI_VENDOR_ID
+ * /sys/class/dvb/dvb0.frontend0/device/irq    for PCI_IRQ
+ */
+
+#define MAXLEN		64
+
+int get_frontend_entry(DIR *dvb_dir, char *frontend_dev)
+{
+	struct dirent *adap_dir;
+	char tmp[MAXLEN];
+
+	adap_dir = readdir(dvb_dir);
+	if (adap_dir != NULL) {
+		/**
+		 * Directory structure follows:
+		 * .
+		 * ..
+		 * ~dvb0.demux0
+		 * ~dvb0.dvr0
+		 * ~dvb0.frontend0
+		 * ~dvb0.net0
+		 * ~dvb1.demux0
+		 * ~dvb1.dvr0
+		 * ~dvb1.frontend0
+		 * ~dvb1.net0
+		 */
+
+		/* print information */
+		sprintf(tmp, "%s/%s", DVB_SYSFS_DIR, adap_dir->d_name);
+		/* search for a dir entry with string "frontend" */
+		if (strstr(tmp, "frontend")) {
+			/* found a dvbX.frontendY */
+			strcpy(frontend_dev, tmp);
+			return 0;
+		} else {
+			return -2;
+		}
+	} else {
+		return -1;
+	}
+}
+
+
+/* read device number and adapter number from the uevent file */
+int read_frontend_uevent(char *uevent, int *device, int *adapter)
+{
+	char uf_name[MAXLEN];
+	FILE *ufile;
+	char line[128];
+	char *token = NULL;
+
+	/* get uevent file */
+	sprintf(uf_name, "%s/%s", uevent, "uevent");
+	ufile = fopen(uf_name, "r");
+	if (ufile == NULL) {
+		fprintf(stderr, "File: %s open failed\n", uf_name);
+		return -1;
+	}
+
+	while (1) {
+		if (fgets(line, sizeof (line), ufile) == NULL)
+			return -1;
+
+		if (strstr(line, "DVB_ADAPTER_NUM")) {
+			token = strtok(line, "=");
+			token = strtok(NULL, "=");
+			*adapter = atoi(token);
+		}
+
+		if (strstr(line, "DVB_DEVICE_NUM")) {
+			token = strtok(line, "=");
+			token = strtok(NULL, "=");
+			*device = atoi(token);
+		}
+	}
+
+	fclose(ufile);
+	return 0;
+}
+
+int read_device_uevent(char *uevent,
+		       char *drv,
+		       int *pci_ven,
+		       int *pci_dev,
+		       int *pci_subven,
+		       int *pci_subdev,
+		       int *domain,
+		       int *bus,
+		       int *device,
+		       int *fn)
+{
+	char uf_name[MAXLEN];
+	FILE *ufile;
+	char line[128];
+	char *token = NULL;
+	char *tmp;
+	int i;
+
+	/* get uevent file */
+	sprintf(uf_name, "%s/%s", uevent, "device/uevent");
+	ufile = fopen(uf_name, "r");
+	if (ufile == NULL) {
+		fprintf(stderr, "File: %s open failed\n", uf_name);
+		return -1;
+	}
+
+	while (1) {
+		if (fgets(line, sizeof (line), ufile) == NULL)
+			return -1;
+
+		if (strstr(line, "DRIVER")) {
+			token = strtok(line, "=");
+			token = strtok(NULL, "=");
+			for (i = 0; i < strlen(token); i++) {
+				if (token[i] == '\n' || token[i] == '\r')
+					token[i] = '\0';
+			}
+			strcpy(drv, token);
+		}
+		if (strstr(line, "PCI_ID")) {
+			token = strtok(line, "=");
+			token = strtok(NULL, "=");
+			*pci_ven = atoi(strtok(token, ":"));
+			*pci_dev = atoi(strtok(NULL, ":"));
+		}
+		if (strstr(line, "PCI_SUBSYS_ID")) {
+			token = strtok(line, "=");
+			token = strtok(NULL, "=");
+			*pci_subven = atoi(strtok(token, ":"));
+			*pci_subdev = atoi(strtok(NULL, ":"));
+
+		}
+		if (strstr(line, "PCI_SLOT_NAME")) {
+			token = strtok(line, "=");
+			token = strtok(NULL, "=");
+			*domain = atoi(strtok(token, ":"));
+			*bus = atoi(strtok(NULL, ":"));
+			tmp = strtok(NULL, ":");
+			*device = atoi(strtok(tmp, "."));
+			*fn = atoi(strtok(NULL, "."));
+		}
+	}
+
+	fclose(ufile);
+	return 0;
+}
+
+/* retrieve frontend info */
+int get_frontend_info(int adapter, char *frontend)
+{
+	DIR *dev_dir;
+	struct dirent *adap_dir;
+	char tmp[MAXLEN];
+
+	sprintf(tmp, "%s/adapter%d", DVB_DIR, adapter);
+	dev_dir = opendir(tmp);
+	if (!dev_dir) {
+		fprintf(stderr, "ERROR: Opening %s directory\n", tmp);
+		return - 1;
+	}
+
+	while ((adap_dir = readdir(dev_dir)) != NULL) {
+		/**
+		 * Directory structure follows:
+		 * .
+		 * ..
+		 * frontend0
+		 * frontend1
+		 * demux0
+		 * dvr0
+		 * net0
+		 */
+		if (!strcmp(adap_dir->d_name, "."))
+			continue;
+		if (!strcmp(adap_dir->d_name, ".."))
+			continue;
+
+		/* search for a dir entry with string "frontend" */
+		if (strstr(adap_dir->d_name, "frontend")) {
+			/* found a dvbX.frontendY */
+			strcpy(frontend, adap_dir->d_name);
+		}
+
+	}
+
+	closedir(dev_dir);
+	return 0;
+}
+
+int main(void)
+{
+	DIR *sys_dir;
+	char frontend_dev[MAXLEN];
+	int entry, device, adapter;
+	char drv[MAXLEN];
+	int pci_ven, pci_dev, pci_subven, pci_subdev;
+	int domain, bus, dev, fn;
+	int dev_prev = -1;
+
+	char tmp[MAXLEN];
+	char frontend[MAXLEN];
+	char fedev[MAXLEN];
+	int fd, ret;
+	struct dvb_frontend_info info;
+
+	static char *fe_type[] = {
+		[0] = "FE_QPSK",
+		[1] = "FE_QAM",
+		[2] = "FE_OFDM",
+		[3] = "FE_ATSC",
+	};
+
+	fprintf(stderr, "\n\t\tlsdvb: Simple utility to list PCI/PCIe DVB devices\n");
+	fprintf(stderr, "\t\tVersion: 0.0.4\n");
+	fprintf(stderr, "\t\tCopyright (C) Manu Abraham\n");
+	sys_dir = opendir(DVB_SYSFS_DIR);
+	if (!sys_dir) {
+		fprintf(stderr, "ERROR: Opening %s directory\n", DVB_SYSFS_DIR);
+		return - 1;
+	}
+
+	while (1) {
+		entry = get_frontend_entry(sys_dir, frontend_dev);
+		if (entry == 0) {
+
+			read_device_uevent(frontend_dev,
+					   drv,
+					   &pci_ven,
+					   &pci_dev,
+					   &pci_subven,
+					   &pci_subdev,
+					   &domain,
+					   &bus,
+					   &dev,
+					   &fn);
+
+			read_frontend_uevent(frontend_dev, &device, &adapter);
+			if (device != dev_prev) {
+				fprintf(stderr, "\n%s (%d:%d %d:%d) on PCI Domain:%d Bus:%d Device:%d Function:%d\n",
+					drv, pci_ven, pci_dev, pci_subven, pci_subdev, domain, bus, dev, fn);
+			}
+
+			fprintf(stderr, "\tDEVICE:%d ADAPTER:%d ", device, adapter);
+			dev_prev = device;
+
+			get_frontend_info(adapter, frontend);
+			sprintf(fedev, "%s/adapter%d/%s", DVB_DIR, adapter, frontend);
+			fd = open(fedev, O_RDWR | O_NONBLOCK);
+			if (fd < 0) {
+				fprintf(stderr, "ERROR: Open %s failed\n", frontend);
+				return -1;
+			}
+
+			ret = ioctl(fd, FE_GET_INFO, &info);
+			if (ret < 0) {
+				fprintf(stderr, "ERROR: IOCTL failed\n");
+				return -1;
+			}
+			strncpy(tmp, frontend + 8, 1);
+			fprintf(stderr, "FRONTEND:%d (%s) \n\t\t %s Fmin=%dMHz Fmax=%dMHz\n",
+				atoi(tmp),
+				info.name,
+				fe_type[info.type],
+				info.type == 0 ? info.frequency_min / 1000: info.frequency_min / 1000000,
+				info.type == 0 ? info.frequency_max / 1000: info.frequency_max / 1000000);
+		}
+
+		if (entry == -1)
+			break;
+		if (entry == -2)
+			continue;
+
+	}
+
+	closedir(sys_dir);
+
+	return 0;
+}
diff --git a/util/scan/atsc/ca-AB-Calgary b/util/scan/atsc/ca-AB-Calgary
new file mode 100644
index 0000000..526fcc5
--- /dev/null
+++ b/util/scan/atsc/ca-AB-Calgary
@@ -0,0 +1,15 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20110502 1 0 ATSC CA </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Calgary AB, Canada OTA
+# date (yyyy-mm-dd)    : 2011-06-17
+# provided by (opt)    : shadowofdarkness@gmail.com
+#
+# A[2] <freq> <mod> [# comment]
+#------------------------------------------------------------------------------
+A 515000000     8VSB
+A 563000000     8VSB
+A 635000000     8VSB
+A 683000000     8VSB
diff --git a/util/scan/atsc/us-Cable-Standard-center-frequencies-QAM256 b/util/scan/atsc/us-Cable-Standard-center-frequencies-QAM256
index 4367e7a..c20fe9c 100644
--- a/util/scan/atsc/us-Cable-Standard-center-frequencies-QAM256
+++ b/util/scan/atsc/us-Cable-Standard-center-frequencies-QAM256
@@ -138,3 +138,39 @@ A 783000000 QAM256
 A 789000000 QAM256
 A 795000000 QAM256
 A 801000000 QAM256
+A 807000000 QAM256
+A 813000000 QAM256
+A 819000000 QAM256
+A 825000000 QAM256
+#121
+A 831000000 QAM256
+A 837000000 QAM256
+A 843000000 QAM256
+A 849000000 QAM256
+A 855000000 QAM256
+A 861000000 QAM256
+A 867000000 QAM256
+A 873000000 QAM256
+A 879000000 QAM256
+A 885000000 QAM256
+#122
+A 891000000 QAM256
+A 897000000 QAM256
+A 903000000 QAM256
+A 909000000 QAM256
+A 915000000 QAM256
+A 921000000 QAM256
+A 927000000 QAM256
+A 933000000 QAM256
+A 939000000 QAM256
+A 945000000 QAM256
+#123
+A 951000000 QAM256
+A 957000000 QAM256
+A 963000000 QAM256
+A 969000000 QAM256
+A 975000000 QAM256
+A 981000000 QAM256
+A 987000000 QAM256
+A 993000000 QAM256
+A 999000000 QAM256
diff --git a/util/scan/dvb-c/br-Net-Digital b/util/scan/dvb-c/br-Net-Digital
new file mode 100644
index 0000000..8900124
--- /dev/null
+++ b/util/scan/dvb-c/br-Net-Digital
@@ -0,0 +1,6 @@
+# Net Digital
+# Just the initial transponder is enough
+
+# freq sr fec mod
+# Found on Sao Jose dos Campos, SP
+C 573000000 5217000 NONE QAM256
diff --git a/util/scan/dvb-c/de-Brandenburg-Havel b/util/scan/dvb-c/de-Brandenburg-Havel
new file mode 100644
index 0000000..088f113
--- /dev/null
+++ b/util/scan/dvb-c/de-Brandenburg-Havel
@@ -0,0 +1,30 @@
+# Brandenburg an der Havel
+# freq sr fec mod
+C 378000000 6900000 NONE QAM64
+C 386000000 6900000 NONE QAM64
+C 394000000 6900000 NONE QAM64
+C 402000000 6900000 NONE QAM64
+C 410000000 6900000 NONE QAM64
+C 418000000 6900000 NONE QAM64
+C 426000000 6875000 NONE QAM64
+C 434000000 6900000 NONE QAM64
+C 442000000 6900000 NONE QAM64
+C 450000000 6900000 NONE QAM64
+C 458000000 6900000 NONE QAM64
+C 466000000 6900000 NONE QAM64
+C 490000000 6900000 NONE QAM256
+C 498000000 6900000 NONE QAM256
+C 506000000 6900000 NONE QAM256
+C 530000000 6900000 NONE QAM256
+C 538000000 6900000 NONE QAM256
+C 546000000 6900000 NONE QAM256
+C 554000000 6900000 NONE QAM256
+C 562000000 6900000 NONE QAM256
+C 570000000 6900000 NONE QAM64
+C 578000000 6900000 NONE QAM256
+C 586000000 6900000 NONE QAM64
+C 594000000 6900000 NONE QAM64
+C 602000000 6900000 NONE QAM64
+C 610000000 6900000 NONE QAM64
+C 618000000 6900000 NONE QAM64
+C 626000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/de-Primacom b/util/scan/dvb-c/de-Primacom
index 2d4870f..1e99b4c 100644
--- a/util/scan/dvb-c/de-Primacom
+++ b/util/scan/dvb-c/de-Primacom
@@ -1,6 +1,9 @@
 # Primacom
 # freq sr fec mod
 C 121000000 6900000 NONE QAM64
+C 129000000 6900000 NONE QAM256
+C 137000000 6900000 NONE QAM256
+C 145000000 6900000 NONE QAM256
 C 306000000 6900000 NONE QAM64
 C 314000000 6900000 NONE QAM64
 C 322000000 6900000 NONE QAM64
@@ -13,6 +16,8 @@ C 370000000 6900000 NONE QAM256
 C 378000000 6900000 NONE QAM256
 C 386000000 6900000 NONE QAM256
 C 394000000 6900000 NONE QAM256
+C 402000000 6900000 NONE QAM256
+C 410000000 6900000 NONE QAM256
 C 418000000 6900000 NONE QAM256
 C 434000000 6900000 NONE QAM64
 C 442000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/de-Unitymedia b/util/scan/dvb-c/de-Unitymedia
index 3ba9c21..b01020d 100644
--- a/util/scan/dvb-c/de-Unitymedia
+++ b/util/scan/dvb-c/de-Unitymedia
@@ -1,35 +1,36 @@
 # Unitymedia
-# Created from http://www.unitymedia.de/service/tv/frequenzen.html
-# and http://blob.unitymedia.de/Download/Unitymedia_Senderlineup_digital_2008-05-28.pdf
+# Created from http://www.unitymedia.de/service/soforthilfe/frequenzen.html
+# and http://www.unitymedia.de/images/UnityDigitalTV_Lineup_01-07-2009.pdf
 # freq sr fec mod
 C 113000000 6900000 NONE QAM256
 C 121000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
 C 346000000 6900000 NONE QAM256
 C 354000000 6900000 NONE QAM64
 C 362000000 6900000 NONE QAM64
 C 370000000 6900000 NONE QAM64
 C 378000000 6900000 NONE QAM64
 C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM256
+C 394000000 6900000 NONE QAM64
 C 402000000 6900000 NONE QAM256
 C 410000000 6900000 NONE QAM256
 C 418000000 6900000 NONE QAM256
 C 426000000 6900000 NONE QAM256
 C 434000000 6900000 NONE QAM256
-C 442000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
+C 442000000 6900000 NONE QAM256
+C 450000000 6900000 NONE QAM256
 C 458000000 6900000 NONE QAM256
 C 466000000 6900000 NONE QAM256
-C 474000000 6900000 NONE QAM64
 C 522000000 6900000 NONE QAM256
 C 530000000 6900000 NONE QAM256
 C 538000000 6900000 NONE QAM256
+C 546000000 6900000 NONE QAM256
 C 554000000 6900000 NONE QAM256
 C 562000000 6900000 NONE QAM256
 C 570000000 6900000 NONE QAM256
-C 610000000 6900000 NONE QAM64
 C 650000000 6900000 NONE QAM256
 C 658000000 6900000 NONE QAM256
 C 666000000 6900000 NONE QAM256
 C 674000000 6900000 NONE QAM256
+C 682000000 6900000 NONE QAM256
+C 690000000 6900000 NONE QAM256
+C 698000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/de-komro-Rosenheim b/util/scan/dvb-c/de-komro-Rosenheim
new file mode 100644
index 0000000..624513e
--- /dev/null
+++ b/util/scan/dvb-c/de-komro-Rosenheim
@@ -0,0 +1,30 @@
+# komro (Rosenheim)
+# freq sr fec mod
+C 113000000 6900000 NONE QAM64
+C 121000000 6900000 NONE QAM64
+C 338000000 6900000 NONE QAM256
+C 394000000 6900000 NONE QAM256
+C 450000000 6900000 NONE QAM64
+C 458000000 6900000 NONE QAM64
+C 466000000 6900000 NONE QAM64
+C 522000000 6900000 NONE QAM256
+C 530000000 6900000 NONE QAM256
+C 602000000 6900000 NONE QAM256
+C 610000000 6900000 NONE QAM256
+C 626000000 6900000 NONE QAM256
+C 642000000 6900000 NONE QAM256
+C 650000000 6900000 NONE QAM256
+C 658000000 6900000 NONE QAM64
+C 666000000 6900000 NONE QAM64
+C 682000000 6900000 NONE QAM64
+C 690000000 6900000 NONE QAM256
+C 698000000 6900000 NONE QAM256
+C 706000000 6900000 NONE QAM256
+C 714000000 6900000 NONE QAM256
+C 722000000 6900000 NONE QAM256
+C 730000000 6900000 NONE QAM64
+C 738000000 6900000 NONE QAM64
+C 746000000 6900000 NONE QAM64
+C 754000000 6900000 NONE QAM64
+C 762000000 6900000 NONE QAM256
+C 778000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/de-neftv b/util/scan/dvb-c/de-neftv
index 59e7658..4de6b42 100644
--- a/util/scan/dvb-c/de-neftv
+++ b/util/scan/dvb-c/de-neftv
@@ -1,7 +1,8 @@
 # Cable conf for NEFtv
-# (Nuernberg, Erlangen, Fuerth and Herzogenaurach)
+# (Nuernberg, Erlangen, Fuerth and Herzogenaurach (herzomedia))
 
 # freq sr fec mod
+C 113000000 6900000 NONE QAM64
 C 346000000 6875000 NONE QAM64
 C 354000000 6875000 NONE QAM64
 C 362000000 6875000 NONE QAM64
@@ -10,14 +11,24 @@ C 378000000 6875000 NONE QAM64
 C 386000000 6875000 NONE QAM64
 C 394000000 6875000 NONE QAM64
 C 402000000 6875000 NONE QAM64
-C 410000000 6875000 NONE QAM64
+C 410000000 6900000 NONE QAM64
 C 418000000 6875000 NONE QAM64
-C 426000000 6875000 NONE QAM64
-C 434000000 6875000 NONE QAM64
-C 450000000 6875000 NONE QAM64
+C 426000000 6900000 NONE QAM64
+C 434000000 6900000 NONE QAM64
+C 442000000 6900000 NONE QAM256
+C 450000000 6900000 NONE QAM256
 C 458000000 6875000 NONE QAM64
+# The following channel is only available in Herzogenaurach
+C 466000000 6900000 NONE QAM64
 C 474000000 6875000 NONE QAM64
 C 490000000 6875000 NONE QAM64
 C 498000000 6875000 NONE QAM64
 C 514000000 6875000 NONE QAM64
+C 522000000 6900000 NONE QAM64
 C 546000000 6875000 NONE QAM64
+C 618000000 6900000 NONE QAM64
+C 634000000 6900000 NONE QAM64
+C 786000000 6900000 NONE QAM256
+C 794000000 6900000 NONE QAM64
+C 802000000 6900000 NONE QAM64
+C 810000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/dk-Aarhus-Antenneforening b/util/scan/dvb-c/dk-Aarhus-Antenneforening
new file mode 100644
index 0000000..2a2f464
--- /dev/null
+++ b/util/scan/dvb-c/dk-Aarhus-Antenneforening
@@ -0,0 +1,2 @@
+# freq sr fec mod
+C 346000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/fi-3ktv b/util/scan/dvb-c/fi-3ktv
deleted file mode 100644
index 1ec2278..0000000
--- a/util/scan/dvb-c/fi-3ktv
+++ /dev/null
@@ -1,20 +0,0 @@
-# 3KTV network reference channels
-# freq      sr      fec  mod
-C 154000000 6875000 NONE QAM128
-C 162000000 6875000 NONE QAM128
-C 170000000 6875000 NONE QAM128
-C 232000000 6875000 NONE QAM128
-C 298000000 6875000 NONE QAM128
-C 306000000 6875000 NONE QAM128
-C 314000000 6875000 NONE QAM128
-C 322000000 6875000 NONE QAM128
-C 330000000 6875000 NONE QAM128
-C 338000000 6875000 NONE QAM128
-C 346000000 6875000 NONE QAM128
-C 354000000 6875000 NONE QAM128
-C 362000000 6875000 NONE QAM128
-C 370000000 6875000 NONE QAM128
-C 378000000 6875000 NONE QAM128
-C 394000000 6875000 NONE QAM128
-C 402000000 6875000 NONE QAM128
-C 450000000 6875000 NONE QAM128
diff --git a/util/scan/dvb-c/fi-Turku b/util/scan/dvb-c/fi-Turku
index b6b435a..d11c11f 100644
--- a/util/scan/dvb-c/fi-Turku
+++ b/util/scan/dvb-c/fi-Turku
@@ -3,6 +3,13 @@
 C 146000000 6900000 NONE QAM128
 C 154000000 6900000 NONE QAM128
 C 162000000 6900000 NONE QAM128
+C 234000000 6900000 NONE QAM256
+C 242000000 6900000 NONE QAM256
+C 250000000 6900000 NONE QAM256
+C 258000000 6900000 NONE QAM256
+C 266000000 6900000 NONE QAM256
+C 290000000 6900000 NONE QAM128
+C 298000000 6900000 NONE QAM128
 C 322000000 6900000 NONE QAM128
 C 330000000 6900000 NONE QAM128
 C 338000000 6900000 NONE QAM128
@@ -14,4 +21,3 @@ C 410000000 6900000 NONE QAM128
 C 418000000 6900000 NONE QAM128
 C 426000000 6900000 NONE QAM128
 C 442000000 6900000 NONE QAM128
-C 354000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/fi-dna b/util/scan/dvb-c/fi-dna
new file mode 100644
index 0000000..38a3afb
--- /dev/null
+++ b/util/scan/dvb-c/fi-dna
@@ -0,0 +1,34 @@
+# DNA network reference channels
+# updated 2011-04-08 Antti Palosaari <crope@iki.fi>
+# http://www.dna.fi/YKSITYISILLE/TV/KAAPELITV/Sivut/Taajuudet.aspx
+#
+# freq      sr      fec  mod
+C 154000000 6875000 NONE QAM128
+C 162000000 6875000 NONE QAM128
+C 162000000 6875000 NONE QAM256
+C 170000000 6875000 NONE QAM128
+C 226000000 6875000 NONE QAM128
+C 234000000 6875000 NONE QAM128
+C 242000000 6875000 NONE QAM128
+C 242000000 6875000 NONE QAM256
+C 250000000 6875000 NONE QAM256
+C 258000000 6875000 NONE QAM256
+C 266000000 6875000 NONE QAM256
+C 274000000 6875000 NONE QAM256
+C 282000000 6875000 NONE QAM256
+C 290000000 6875000 NONE QAM256
+C 298000000 6875000 NONE QAM128
+C 298000000 6875000 NONE QAM256
+C 306000000 6875000 NONE QAM128
+C 314000000 6875000 NONE QAM128
+C 322000000 6875000 NONE QAM128
+C 330000000 6875000 NONE QAM128
+C 338000000 6875000 NONE QAM128
+C 346000000 6875000 NONE QAM128
+C 354000000 6875000 NONE QAM128
+C 362000000 6875000 NONE QAM128
+C 362000000 6875000 NONE QAM256
+C 370000000 6875000 NONE QAM128
+C 378000000 6875000 NONE QAM128
+C 386000000 6875000 NONE QAM128
+C 394000000 6875000 NONE QAM128
diff --git a/util/scan/dvb-c/hu-Digikabel b/util/scan/dvb-c/hu-Digikabel
index c885bff..3442d52 100644
--- a/util/scan/dvb-c/hu-Digikabel
+++ b/util/scan/dvb-c/hu-Digikabel
@@ -1,24 +1,25 @@
-# Digikabel, Hungary
-# For the following cities:
-#  Budapest, Dorog, Hatvan, Kiskunhalas, Debrecen, Szekesfehervar, Pecs,
-#  Veszprem, Dunaujvaros, Miskolc, Gyongyos, Tatabanya, Varpalota, Nagykanizsa,
-#  Salgotarjan, Batonyterenye, Szolnok, Szentistvan, Nyiregyhaza, Gyor,
-#  Szazhalombatta, Bekescsaba, Bekes, Eger, Komlo, Oroszlany
-# In some of the cities not all the frequencies are available.
-# freq sr fec mod
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 770000000 6900000 NONE QAM256
-C 778000000 6900000 NONE QAM256
-C 786000000 6900000 NONE QAM256
-C 794000000 6900000 NONE QAM256
-C 834000000 6900000 NONE QAM256
-C 842000000 6900000 NONE QAM256
-C 850000000 6900000 NONE QAM256
-C 858000000 6900000 NONE QAM256
+# Digikabel, Hungary
+# For the following cities:
+#  Budapest, Dorog, Hatvan, Kiskunhalas, Debrecen, Szekesfehervar, Pecs,
+#  Veszprem, Dunaujvaros, Miskolc, Gyongyos, Tatabanya, Varpalota, Nagykanizsa,
+#  Salgotarjan, Batonyterenye, Szolnok, Szentistvan, Nyiregyhaza, Gyor,
+#  Szazhalombatta, Bekescsaba, Bekes, Eger, Komlo, Oroszlany
+# In some of the cities not all the frequencies are available.
+# freq sr fec mod
+C 121000000 6900000 NONE QAM256
+C 354000000 6900000 NONE QAM256
+C 362000000 6900000 NONE QAM256
+C 370000000 6900000 NONE QAM256
+C 378000000 6900000 NONE QAM256
+C 386000000 6900000 NONE QAM256
+C 394000000 6900000 NONE QAM256
+C 402000000 6900000 NONE QAM256
+C 410000000 6900000 NONE QAM256
+C 746000000 6900000 NONE QAM256
+C 754000000 6900000 NONE QAM256
+C 762000000 6900000 NONE QAM256
+C 770000000 6900000 NONE QAM256
+C 778000000 6900000 NONE QAM256
+C 786000000 6900000 NONE QAM256
+C 794000000 6900000 NONE QAM256
+C 850000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/nl-Delta b/util/scan/dvb-c/nl-Delta
new file mode 100644
index 0000000..ac6548f
--- /dev/null
+++ b/util/scan/dvb-c/nl-Delta
@@ -0,0 +1,8 @@
+# Initial Tuning file for nl-DELTA
+# This file only lists the main
+# frequency. You still need to do
+# a network scan to find other
+# transponders.
+#
+#
+C 402000000 6875000 NONE QAM64 # Main Frequency
diff --git a/util/scan/dvb-c/nl-REKAM-CAIW_Gouda b/util/scan/dvb-c/nl-REKAM-CAIW_Gouda
new file mode 100644
index 0000000..1f9d01c
--- /dev/null
+++ b/util/scan/dvb-c/nl-REKAM-CAIW_Gouda
@@ -0,0 +1,4 @@
+# REKAM / Caiway, Gouda, Netherlands
+# freq sr fec mod
+C 163000000 6875000 NONE QAM64
+C 770000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-s/OptusD1-160.0E b/util/scan/dvb-s/OptusD1-160.0E
new file mode 100644
index 0000000..b13437d
--- /dev/null
+++ b/util/scan/dvb-s/OptusD1-160.0E
@@ -0,0 +1,4 @@
+# Optus D1 satellite 160.0E
+# freq pol sr fec
+S 12456000 H 22500000 3/4
+S 12483000 H 22500000 3/4
diff --git a/util/scan/dvb-s/Thor-1.0W b/util/scan/dvb-s/Thor-1.0W
index 99e98d4..b271e36 100644
--- a/util/scan/dvb-s/Thor-1.0W
+++ b/util/scan/dvb-s/Thor-1.0W
@@ -1,5 +1,18 @@
 # Thor 1.0W
 # freq pol sr fec
+S 10747000 H 25000000 3/4
+S 10778000 V 25000000 3/4
+S 10778000 H 24500000 7/8
+S 10809000 V 24500000 7/8
+S 10809000 H 24500000 7/8
+S 10841000 V 24500000 7/8
+S 10841000 H 24500000 7/8
+S 10872000 V 24500000 7/8
+S 10872000 H 24500000 7/8
+S 10903000 V 25000000 3/4
+S 10903000 H 25000000 3/4
+S 10934000 V 24500000 7/8
+S 10934000 H 25000000 3/4
 S 11216000 V 24500000 7/8
 S 11229000 H 24500000 7/8
 S 11247000 V 24500000 7/8
@@ -17,11 +30,25 @@ S 11389000 H 24500000 7/8
 S 11403000 V 24500000 7/8
 S 11421000 H 24500000 7/8
 S 11434000 V 24500000 7/8
+S 11727000 V 28000000 7/8
 S 11747000 H 28000000 5/6
-S 11785000 H 28000000 5/6
+S 11766000 V 28000000 7/8
+S 11785000 H 30000000 3/4
+S 11804000 V 28000000 7/8
 S 11823000 H 28000000 7/8
+S 11843000 V 30000000 3/4
+S 11862000 H 28000000 7/8
+S 11881000 V 28000000 5/6
+S 11900000 H 28000000 5/6
+S 11919000 V 28000000 7/8
 S 11938000 H 25000000 3/4
+S 11958000 V 28000000 7/8
+S 11977000 H 28000000 7/8
+S 11996000 V 28000000 7/8
 S 12015000 H 30000000 3/4
+S 12034000 V 28000000 7/8
+S 12073000 V 28000000 7/8
+S 12092000 H 30000000 3/4
 S 12130000 H 30000000 3/4
 S 12149000 V 28000000 5/6
 S 12169000 H 28000000 7/8
@@ -30,6 +57,8 @@ S 12226000 V 28000000 3/4
 S 12245000 H 28000000 5/6
 S 12303000 V 28000000 5/6
 S 12322000 H 27800000 3/4
+S 12341000 V 28000000 7/8
+S 12380000 V 28000000 5/6
 S 12399000 H 28000000 7/8
 S 12418000 V 28000000 7/8
 S 12456000 V 28000000 3/4
diff --git a/util/scan/dvb-t/au-Adelaide b/util/scan/dvb-t/au-Adelaide
index 3bd3a0f..923e701 100644
--- a/util/scan/dvb-t/au-Adelaide
+++ b/util/scan/dvb-t/au-Adelaide
@@ -10,3 +10,5 @@ T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SBS
 T 564500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# 3D Trial Australia
+T 536625000 7MHz 3/4 NONE QAM16 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-Ballarat b/util/scan/dvb-t/au-Ballarat
new file mode 100644
index 0000000..c6c2a54
--- /dev/null
+++ b/util/scan/dvb-t/au-Ballarat
@@ -0,0 +1,12 @@
+# Australia / Ballarat
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# ABC
+T 620625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Prime
+T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# WIN
+T 592625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# SC
+T 613500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# SBS
+T 634625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-Brisbane b/util/scan/dvb-t/au-Brisbane
index abf9913..67d9290 100644
--- a/util/scan/dvb-t/au-Brisbane
+++ b/util/scan/dvb-t/au-Brisbane
@@ -10,3 +10,5 @@ T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SBS
 T 585625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# 31 Digital
+T 599500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-Sydney_North_Shore b/util/scan/dvb-t/au-Sydney_North_Shore
index e175490..ed36233 100644
--- a/util/scan/dvb-t/au-Sydney_North_Shore
+++ b/util/scan/dvb-t/au-Sydney_North_Shore
@@ -13,4 +13,4 @@ T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SBS UHF34
 T 571500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
 # D44 UHF35
-T 578500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 536625000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/auto-Australia b/util/scan/dvb-t/auto-Australia
new file mode 100644
index 0000000..393ac7f
--- /dev/null
+++ b/util/scan/dvb-t/auto-Australia
@@ -0,0 +1,110 @@
+# for ($freq = 177500000; $freq <= 226500000; $freq += 7000000) {
+# 	print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# 	print "T ", $freq + 125000, " 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+# for ($freq = 529500000; $freq <= 816500000; $freq += 7000000) {
+# 	print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# 	print "T ", $freq + 125000, " 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 177625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 184625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 191625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 198625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 205625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 212625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 219625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 226625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 529500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 529625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 536500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 536625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 543500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 543625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 550500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 550625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 557500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 557625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 564500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 564625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 571500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 571625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 578500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 578625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 585500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 585625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 592500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 592625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 599500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 599625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 606500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 606625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 613500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 613625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 620500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 620625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 627500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 627625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 634500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 634625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 641500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 641625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 648500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 648625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 655500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 655625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 662500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 662625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 669500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 669625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 676500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 676625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 683500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 683625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 690500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 690625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 697500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 697625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 704500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 704625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 711500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 711625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 718500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 718625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 725500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 725625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 732500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 732625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 739500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 739625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 746500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 746625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 753500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 753625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 760500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 760625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 767500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 767625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 774500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 774625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 781500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 781625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 788500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 788625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 795500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 795625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 802500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 802625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 809500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 809625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 816500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 816625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/util/scan/dvb-t/auto-Default b/util/scan/dvb-t/auto-Default
new file mode 100644
index 0000000..5aedde9
--- /dev/null
+++ b/util/scan/dvb-t/auto-Default
@@ -0,0 +1,65 @@
+# for ($freq = 177500000; $freq <= 226500000; $freq += 7000000) {
+# 	print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+# for ($freq = 474000000; $freq <= 858000000; $freq += 8000000) {
+# 	print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 474000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 482000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 490000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 498000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 506000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 514000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 522000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 530000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 538000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 546000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 554000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 562000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 570000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 578000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 586000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 594000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 602000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 610000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 618000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 626000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 634000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 642000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 650000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 658000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 666000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 674000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 682000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 690000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 698000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 706000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 714000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 722000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 730000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 738000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 746000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 754000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 762000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 770000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 778000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 786000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 794000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 802000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 810000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 818000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 826000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 834000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 842000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 850000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 858000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/util/scan/dvb-t/auto-Italy b/util/scan/dvb-t/auto-Italy
new file mode 100644
index 0000000..160bf73
--- /dev/null
+++ b/util/scan/dvb-t/auto-Italy
@@ -0,0 +1,72 @@
+# for $freq (177500000, 186000000, 194500000, 203500000, 212500000, 219500000, 226500000) {
+# 	print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# 	print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+# for ($freq = 474000000; $freq <= 858000000; $freq += 8000000) {
+# 	print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 177500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 186000000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 186000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 194500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 194500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 203500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 203500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 212500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 219500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 226500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 474000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 482000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 490000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 498000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 506000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 514000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 522000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 530000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 538000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 546000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 554000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 562000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 570000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 578000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 586000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 594000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 602000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 610000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 618000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 626000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 634000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 642000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 650000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 658000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 666000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 674000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 682000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 690000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 698000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 706000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 714000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 722000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 730000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 738000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 746000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 754000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 762000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 770000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 778000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 786000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 794000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 802000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 810000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 818000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 826000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 834000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 842000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 850000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 858000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/util/scan/dvb-t/auto-Taiwan b/util/scan/dvb-t/auto-Taiwan
new file mode 100644
index 0000000..c32af48
--- /dev/null
+++ b/util/scan/dvb-t/auto-Taiwan
@@ -0,0 +1,18 @@
+# for ($freq = 527000000; $freq <= 599000000; $freq += 6000000) {
+# 	print "T $freq 6MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 527000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 533000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 539000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 545000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 551000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 557000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 563000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 569000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 575000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 581000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 587000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 593000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
+T 599000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/util/scan/dvb-t/auto-With167kHzOffsets b/util/scan/dvb-t/auto-With167kHzOffsets
new file mode 100644
index 0000000..5dfbd2e
--- /dev/null
+++ b/util/scan/dvb-t/auto-With167kHzOffsets
@@ -0,0 +1,165 @@
+# for ($freq = 177500000; $freq <= 226500000; $freq += 7000000) {
+# 	print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+# for ($freq = 474000000; $freq <= 858000000; $freq += 8000000) {
+# 	print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# 	print "T ", $freq - 167000, " 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# 	print "T ", $freq + 167000, " 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
+# }
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
+T 474000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 473833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 474167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 482000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 481833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 482167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 490000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 489833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 490167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 498000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 497833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 498167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 506000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 505833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 506167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 514000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 513833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 514167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 522000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 521833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 522167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 530000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 529833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 530167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 538000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 537833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 538167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 546000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 545833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 546167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 554000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 553833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 554167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 562000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 561833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 562167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 570000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 569833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 570167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 578000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 577833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 578167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 586000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 585833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 586167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 594000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 593833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 594167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 602000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 601833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 602167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 610000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 609833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 610167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 618000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 617833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 618167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 626000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 625833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 626167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 634000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 633833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 634167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 642000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 641833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 642167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 650000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 649833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 650167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 658000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 657833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 658167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 666000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 665833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 666167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 674000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 673833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 674167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 682000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 681833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 682167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 690000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 689833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 690167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 698000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 697833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 698167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 706000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 705833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 706167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 714000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 713833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 714167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 722000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 721833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 722167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 730000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 729833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 730167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 738000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 737833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 738167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 746000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 745833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 746167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 754000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 753833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 754167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 762000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 761833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 762167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 770000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 769833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 770167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 778000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 777833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 778167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 786000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 785833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 786167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 794000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 793833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 794167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 802000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 801833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 802167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 810000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 809833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 810167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 818000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 817833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 818167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 826000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 825833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 826167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 834000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 833833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 834167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 842000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 841833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 842167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 850000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 849833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 850167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 858000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 857833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
+T 858167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/util/scan/dvb-t/fi-Smedsbole b/util/scan/dvb-t/ax-Smedsbole
index fa9bc03..fa9bc03 100644
--- a/util/scan/dvb-t/fi-Smedsbole
+++ b/util/scan/dvb-t/ax-Smedsbole
diff --git a/util/scan/dvb-t/be-All b/util/scan/dvb-t/be-All
new file mode 100644
index 0000000..3d9f913
--- /dev/null
+++ b/util/scan/dvb-t/be-All
@@ -0,0 +1,8 @@
+# Belgium, whole country
+# Created from http://nl.wikipedia.org/wiki/DVB-T-frequenties
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
+T 506000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
+T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 834000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/be-Brussels b/util/scan/dvb-t/be-Brussels
deleted file mode 100644
index 6998b48..0000000
--- a/util/scan/dvb-t/be-Brussels
+++ /dev/null
@@ -1,5 +0,0 @@
-# Brussels - Belgium (Transmitters of the RTBF and the VRT)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # RTBF
-T 746000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # BE-TV
-T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # VRT
diff --git a/util/scan/dvb-t/be-Libramont b/util/scan/dvb-t/be-Libramont
deleted file mode 100644
index fb2ae0c..0000000
--- a/util/scan/dvb-t/be-Libramont
+++ /dev/null
@@ -1,10 +0,0 @@
-# Libramont - Belgique
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Canal  7 191.5 MHz M6
-# Canal 24 498.0 MHz RTL-TVI  Club-RTL  Plug-TV  RTL 4,5,7
-# Canal 27 522.0 MHz RTL Lux, den 2ten RTL
-# Canal 56 834.0 MHz RTBF 1,2,3 + radio
-T 191500000 7MHz 1/2 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 1/2 NONE QAM64 8k 1/16 NONE
-T 522000000 8MHz 1/2 NONE QAM64 8k 1/16 NONE
-T 834000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/be-Schoten b/util/scan/dvb-t/be-Schoten
deleted file mode 100644
index d973def..0000000
--- a/util/scan/dvb-t/be-Schoten
+++ /dev/null
@@ -1,3 +0,0 @@
-# Schoten-Antwerpen - Belgie
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/be-St_Pieters_Leeuw b/util/scan/dvb-t/be-St_Pieters_Leeuw
deleted file mode 100644
index 5e44c3f..0000000
--- a/util/scan/dvb-t/be-St_Pieters_Leeuw
+++ /dev/null
@@ -1,3 +0,0 @@
-# St.-Pieters-Leeuw - Belgie
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/be-Tournai b/util/scan/dvb-t/be-Tournai
deleted file mode 100644
index 0ed3ca8..0000000
--- a/util/scan/dvb-t/be-Tournai
+++ /dev/null
@@ -1,3 +0,0 @@
-# Tournai - Belgique
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/ch-All b/util/scan/dvb-t/ch-All
index a471e5e..2e2e273 100644
--- a/util/scan/dvb-t/ch-All
+++ b/util/scan/dvb-t/ch-All
@@ -19,6 +19,7 @@ T 674000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 682000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 690000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 698000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
+T 706000000 8MHz 1/2 NONE QAM16 8k 1/4 NONE
 T 714000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 722000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 722000000 8MHz 5/6 NONE QAM16 8k 1/8 NONE
diff --git a/util/scan/dvb-t/ch-Geneva b/util/scan/dvb-t/ch-Geneva
new file mode 100644
index 0000000..7ad0ae4
--- /dev/null
+++ b/util/scan/dvb-t/ch-Geneva
@@ -0,0 +1,16 @@
+# Switzerland, Geneva region
+# Updated by tkernen@deckpoint.ch on 2010/12/03
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 570166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 578000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
+T 658166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 666166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 682166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 706000000 8MHz 1/2 NONE QAM16 8k 1/4 NONE
+T 746166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 762000000 8MHz 1/2 NONE QPSK 2k 1/32 NONE
+T 770166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 794166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 818166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 850166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/de-Baden-Wuerttemberg b/util/scan/dvb-t/de-Baden-Wuerttemberg
index 4dff1fd..200ef17 100644
--- a/util/scan/dvb-t/de-Baden-Wuerttemberg
+++ b/util/scan/dvb-t/de-Baden-Wuerttemberg
@@ -1,18 +1,18 @@
 # DVB-T Baden-Württemberg
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsPlus
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: SWR-BW, BR, hr, WDR
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: SWR-BW, BR, hr, WDR
-T 634000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH41: SWR-BW, BR, hr, WDR
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: SWR-BW, Bayerisches Fernsehen, hr, WDR
+T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: SWR-BW, Bayerisches Fernsehen, hr, WDR
+T 634000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH41: SWR-BW, Bayerisches Fernsehen, hr, WDR
 T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, arte, Phoenix, EinsPlus
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH45: RTL, RTL II, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: SWR-BW, BR, hr, WDR
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: SWR-BW, BR, hr, WDR
+T 666000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH45: RTL, RTL 2, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
+T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: SWR-BW, Bayerisches Fernsehen, hr, WDR
+T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: SWR-BW, Bayerisches Fernsehen, hr, WDR
 T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Das Erste, arte, Phoenix, EinsPlus
 T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: Das Erste, arte, Phoenix, EinsPlus
 T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Das Erste, arte, Phoenix, EinsPlus
diff --git a/util/scan/dvb-t/de-Bayern b/util/scan/dvb-t/de-Bayern
index 07ceeb0..6839380 100644
--- a/util/scan/dvb-t/de-Bayern
+++ b/util/scan/dvb-t/de-Bayern
@@ -1,40 +1,31 @@
 # DVB-T Bayern
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 191500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE # CH07: Das Erste, arte, Phoenix, EinsPlus
-T 212500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE # CH10: Das Erste, arte, Phoenix, EinsPlus
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: BR, BRalpha, SWR, Das Erste
-                                            # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: BR, BRalpha, SWR, Das Erste
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: BR, BRalpha, SWR, Das Erste
-                                            # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 191500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE # CH07: Das Erste, arte, Phoenix, EinsPlus (bis zum 11.12.2011)
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+                                            # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+                                            # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: Das Erste, arte, Phoenix, EinsPlus
 T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Das Erste, arte, Phoenix, EinsPlus
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: RTL, RTL II, Super RTL, VOX
-                                            # CH34: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Das Erste, arte, Phoenix, EinsPlus
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: BR, BRalpha, SWR, Das Erste
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: BR, BRalpha, hr, mdr
+T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: Bayerisches Fernsehen, BR-alpha, MDR, hr
                                             # CH40: Das Erste, arte, Phoenix, EinsPlus
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: BR, BRalpha, hr, mdr
-                                            # CH45: Das Erste, arte, Phoenix, EinsPlus
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: BR, BRalpha, SWR, Das Erste
-                                            # CH46: BR, BRalpha, hr, mdr
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: BR, BRalpha, hr, mdr
+T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: Das Erste, arte, Phoenix, EinsPlus
+                                            # CH42: Das Erste, arte, Phoenix, EinsPlus (Kanalwechsel am 12.12.2011)
+                                            # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Das Erste, arte, Phoenix, EinsPlus
+T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Bayerisches Fernsehen, BR-alpha, MDR, hr
+                                            # CH46: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Bayerisches Fernsehen, BR-alpha, MDR, hr
                                             # CH47: Das Erste, arte, Phoenix, EinsPlus
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: Pro7, Sat.1, Kabel1, N24
 T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Das Erste, arte, Phoenix, EinsPlus
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Pro7, Sat.1, Kabel1, N24
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: BR, BRalpha, SWR, Das Erste
-                                            # CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: Das Erste, arte, Phoenix, EinsPlus
+T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
+                                            # CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Das Erste, arte, Phoenix, EinsPlus
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH56: BR, BRalpha, SWR, Das Erste
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, Eurosport, MonaTV, Franken TV
-T 834000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH66: RTL, RTL II, Super RTL, VOX
-                                            # CH66: Tele 5, Eurosport, HSE 24, München.TV
diff --git a/util/scan/dvb-t/de-Berlin b/util/scan/dvb-t/de-Berlin
index 5b040c7..d66a54d 100644
--- a/util/scan/dvb-t/de-Berlin
+++ b/util/scan/dvb-t/de-Berlin
@@ -1,12 +1,12 @@
 # DVB-T Berlin
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz 3/4 NONE QAM16 8k 1/8 NONE # CH05: Tele 5, HSE 24 / MonaTV(+ DMAX / Bibel.TV), WDR, SWR (BW / RP)
-T 191500000 7MHz 2/3 NONE QAM16 8k 1/8 NONE # CH07: MDR, NDR, arte
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH25: RTL, RTL II, Super RTL, VOX
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH27: Das Erste, RBB, Phoenix, EinsExtra
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH39: Das Vierte, Bibel.TV, QVC, TVP Polonia (ab Januar 2010)
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH44: Pro7, Sat.1, Kabel1, N24
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH56: Eurosport, TV.B, DSF, Neun live
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH59: n-tv, EuroNews / Channel 21 Shop, + 14 Radioprogramme
+T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH25: RTL, RTL2, Super RTL, VOX
+T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH27: Das Erste, RBB, Phoenix, EinsExtra / BrandenburgAktuell
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # CH39: QVC, DasVierte, Bibel.TV, BR-Fernsehen, n-tv, EuroNews/Channe21 Shop + 7 Radioprogr
+T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH44: ProSieben, Sat.1, Kabel1, N24
+T 682000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH47: MDR, NDR, arte
+T 706000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH50: Tele5, HSE 24, WDR, SWR (BW / RP)
+T 754000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH56: Eurosport, TV.B, Music1, sixx,
+T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH59: BerlinMix1, (freie Kapazitäten)
diff --git a/util/scan/dvb-t/de-Brandenburg b/util/scan/dvb-t/de-Brandenburg
index 9fc6ebe..d9c6f5c 100644
--- a/util/scan/dvb-t/de-Brandenburg
+++ b/util/scan/dvb-t/de-Brandenburg
@@ -1,7 +1,7 @@
 # DVB-T Brandenburg
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 730000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE # CH53: Das Erste, RBB, Phoenix, EinsExtra
 T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: MDR, NDR, arte
diff --git a/util/scan/dvb-t/de-Bremen b/util/scan/dvb-t/de-Bremen
index 9a79038..3be3735 100644
--- a/util/scan/dvb-t/de-Bremen
+++ b/util/scan/dvb-t/de-Bremen
@@ -3,7 +3,7 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix
 T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL II, Super RTL, VOX
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, Neun live, Eurosport, MonaTV/ DMAX
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Pro7, Sat.1, Kabel1, N24
+T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL 2, Super RTL, VOX
+T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, SIXX, QVC, Mona/Das Vierte
+T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: ProSieben, Sat.1, Kabel1, N24
diff --git a/util/scan/dvb-t/de-Hamburg b/util/scan/dvb-t/de-Hamburg
index f746043..7e5bca3 100644
--- a/util/scan/dvb-t/de-Hamburg
+++ b/util/scan/dvb-t/de-Hamburg
@@ -1,10 +1,11 @@
 # DVB-T Hamburg
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR HH
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Pro7, Sat.1, Kabel1, N24
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
 T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL, RTL II, Super RTL, VOX
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Neun live, HH1, Bibel.TV, Eurosport
-T 738000000 8MHz 1/2 NONE QAM64 8k 1/8 NONE # CH54: NDR HH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR SH
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Tele 5, Das Vierte, QVC, Channel21/ Euronews
+T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL / Guten Abend RTL, RTL 2, Super RTL, VOX
+T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: SIXX, Hamburg 1, Bibel TV, Eurosport
+T 738000000 8MHz 1/2 NONE QAM64 8k 1/8 NONE # CH54: NDR HH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR SH
diff --git a/util/scan/dvb-t/de-Hessen b/util/scan/dvb-t/de-Hessen
index e4ad39c..132c02a 100644
--- a/util/scan/dvb-t/de-Hessen
+++ b/util/scan/dvb-t/de-Hessen
@@ -1,19 +1,19 @@
 # DVB-T Hessen
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 198500000 7MHz 2/3 NONE QAM16 8k 1/4 NONE # CH08: Phoenix, BR, SWR-RP
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: Phoenix, BR, SWR-RP, WDR
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: Das Erste, hr, EinsExtra/arte
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: RTL, RTL II, Super RTL, VOX
-T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: Das Erste, hr, EinsExtra/arte
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: Phoenix, BR, SWR-RP, mdr
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, hr, EinsExtra/arte
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: BR, hr, SWR-BW, WDR
-T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: Pro7, Sat.1, Kabel1, N24
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Phoenix, NDR, mdr, WDR
-T 818000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH64: Tele5, Eurosport, rheinmaintv, Bibel.TV
+T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: Phoenix, Bayerisches Fernsehen, SWR-RP, WDR
+T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: Das Erste, hr, arte / EinsExtra
+T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: RTL, RTL 2, Super RTL, VOX
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: Phoenix, Bayerisches Fernsehen, SWR-RP, MDR
+T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: Das Erste, hr, arte / EinsExtra
+T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: Phoenix, Bayerisches Fernsehen, SWR-RP
+T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, hr, arte / EinsExtra
+T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Tele5, QVC, rheinmaintv / Channel21, Bibel.TV
+T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: Bayerisches Fernsehen, hr, SWR-BW, WDR
+T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: ProSieben, Sat.1, Kabel1, N24
+T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Phoenix, NDR, MDR, WDR
diff --git a/util/scan/dvb-t/de-Mecklenburg-Vorpommern b/util/scan/dvb-t/de-Mecklenburg-Vorpommern
index 24e90ea..2d92c87 100644
--- a/util/scan/dvb-t/de-Mecklenburg-Vorpommern
+++ b/util/scan/dvb-t/de-Mecklenburg-Vorpommern
@@ -1,12 +1,12 @@
-# DVB-T Mecklenburg-Vorpommern
+# DVB-T Mecklenburg-Vorpommernen
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, NDR MVP, RBB, MDR/NDR SH
 T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: Das Erste, NDR MVP, RBB, MDR/NDR SH
 T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
diff --git a/util/scan/dvb-t/de-Niedersachsen b/util/scan/dvb-t/de-Niedersachsen
index 636c1ec..cf474d2 100644
--- a/util/scan/dvb-t/de-Niedersachsen
+++ b/util/scan/dvb-t/de-Niedersachsen
@@ -4,36 +4,26 @@
 T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
 T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix
                                             # CH22: Das Erste, arte, Phoenix, EinsExtra
-                                            # CH22: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: RTL, RTL II, Super RTL, VOX
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: RTL, RTL 2, Super RTL, VOX
 T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsExtra
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Tele 5, NICK / Comedy Central, Eurosport, MONA/DMAX
+T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Tele 5, Nickelodeon/Comedy Central, Eurosport, Mona/Das Vierte
 T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 610000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH38: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 634000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH41: Das Erste, arte, Phoenix, EinsExtra
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL II, Super RTL, VOX
-                                            # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 610000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH38: Das Erste, arte, Phoenix, EinsExtra
+                                            # CH38: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL 2, Super RTL, VOX
+                                            # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, arte, Phoenix, EinsExtra
                                             # CH43: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: Pro7, Sat.1, Kabel1, N24
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, Neun live, Eurosport, MONA/DMAX
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
+T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ProSieben, Sat.1, Kabel1, N24
+T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, SIXX, QVC, Mona/Das Vierte
 T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Das Erste, arte, Phoenix, EinsExtra
 T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: Das Erste, arte, Phoenix, EinsExtra
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Pro7, Sat.1, Kabel1, N24
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: Das Erste, arte, Phoenix, EinsExtra
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Das Erste, arte, Phoenix, EinsExtra
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH56: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
+T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: ProSieben, Sat.1, Kabel1, N24
 T 770000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH58: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
 T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Das Erste, arte, Phoenix, EinsExtra
-                                            # CH59: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, NICK / Comedy Central, Eurosport, MONA/DMAX
-T 826000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH65: Das Erste, arte, Phoenix, EinsExtra
+T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, Nickelodeon/Comedy Central, Eurosport, Mona/Das Vierte
diff --git a/util/scan/dvb-t/de-Nordrhein-Westfalen b/util/scan/dvb-t/de-Nordrhein-Westfalen
index ec768a3..0d60591 100644
--- a/util/scan/dvb-t/de-Nordrhein-Westfalen
+++ b/util/scan/dvb-t/de-Nordrhein-Westfalen
@@ -1,27 +1,23 @@
 # DVB-T Nordrhein-Westfalen
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: Das Erste, arte, Phoenix, EinsFestival
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH22: WDR-Wuppertal, NDR/WDR-Düsseldorf, MDR, SWR
 T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH25: WDR-Dortmund, NDR/WDR-Essen, MDR, SWR
 T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsFestival
-                                            # CH26: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+                                            # CH26: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 522000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH27: WDR-Siegen, NDR, MDR, SWR
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: RTL, RTL II, Super RTL, VOX
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: RTL, RTL2, Super RTL, VOX
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 554000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH31: WDR-Bielefeld, NDR/WDR-Siegen, MDR, SWR
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: CNN, Eurosport, Tele5, VIVA
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Tele5, CNN, Eurosport, VIVA
 T 602000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH37: WDR-Aachen, NDR/WDR-Köln, MDR, SWR
-T 666000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH45: WDR-Münster, NDR/WDR-Dortmund, MDR, SWR
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: WDR-Düsseldorf, MDR/WDR-Duisburg, NDR/WDR-Wuppertal, SWR
+T 674000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH46: WDR-Düsseldorf, MDR/WDR-Duisburg, NDR/WDR-Wuppertal, SWR
 T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: Das Erste, arte, Phoenix, EinsFestival
 T 698000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH49: WDR-Köln, MDR/WDR-Bonn, NDR/WDR-Aachen, SWR
 T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: Das Erste, arte, Phoenix, EinsFestival
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: CNN, Eurosport, Tele5, VIVA
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: Pro7, Sat.1, Kabel1, N24
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Pro7, Sat.1, Kabel1, N24
+T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Tele5, CNN, Eurosport, VIVA
+T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: ProSieben, Sat.1, Kabel1, N24
+T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: ProSieben, Sat.1, Kabel1, N24
 T 762000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH57: WDR-Essen, NDR/WDR-Dortmund, MDR, SWR
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsFestival
diff --git a/util/scan/dvb-t/de-Rheinland-Pfalz b/util/scan/dvb-t/de-Rheinland-Pfalz
index a7d1d98..6eabe6d 100644
--- a/util/scan/dvb-t/de-Rheinland-Pfalz
+++ b/util/scan/dvb-t/de-Rheinland-Pfalz
@@ -1,12 +1,12 @@
 # DVB-T Rheinland-Pfalz
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: SWR-RP, BR, hr, WDR
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, BR, hr, WDR
+T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: SWR-RP, Bayerisches Fernsehen, hr, WDR
+T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, Bayerisches Fernsehen, hr, WDR
 T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Das Erste, arte, Phoenix, EinsPlus
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: SWR-RP, BR, hr, WDR
+T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: SWR-RP, Bayerisches Fernsehen, hr, WDR
 T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH56: Das Erste, arte, Phoenix, EinsPlus
 T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: Das Erste, arte, Phoenix, EinsPlus
 T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsPlus
diff --git a/util/scan/dvb-t/de-Saarland b/util/scan/dvb-t/de-Saarland
index 049ae71..7ac26b3 100644
--- a/util/scan/dvb-t/de-Saarland
+++ b/util/scan/dvb-t/de-Saarland
@@ -1,7 +1,7 @@
 # DVB-T Saarland
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: Das Erste, SR Fernsehen, arte, Phoenix
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, BR, hr, WDR
+T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, Bayerisches Fernsehen, hr, WDR
 T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Tele 5, QVC, Bibel.TV, freie Kapazität
diff --git a/util/scan/dvb-t/de-Sachsen b/util/scan/dvb-t/de-Sachsen
index b3fcffd..e56762f 100644
--- a/util/scan/dvb-t/de-Sachsen
+++ b/util/scan/dvb-t/de-Sachsen
@@ -1,13 +1,14 @@
 # DVB-T Sachsen
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 205500000 7MHz 2/3 NONE QAM64 8k 1/16 NONE # CH09: MDR-SN, rbb, BR, WDR
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH24: Das Erste, arte, Phoenix, EinsFestival
 T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH25: Das Erste, arte, Phoenix, EinsFestival
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH27: MDR-SN, rbb, BR, WDR
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL II, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: MDR-SN, rbb, BR, WDR
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH32: MDR-SN, rbb, BR, WDR
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH27: MDR-SN, rbb, Bayerisches Fernsehen, WDR
+T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL 2, Super RTL, VOX, RTL Crime, RTL Passion [Sendenorm: MPEG-4]
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: MDR-SN, rbb, Bayerisches Fernsehen, WDR
+T 554000000 8MHz 2/3 NONE QAM16 8k 1/16 NONE # CH31: LF Leipzg.Ferns., InfoTVLeipzig, BBCWorld, Bibel.TV, RadioLeipzig, RadioHoreb
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH32: MDR-SN, rbb, Bayerisches Fernsehen, WDR
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH37: MDR-SN, rbb, Bayerisches Fernsehen, WDR
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH39: Das Erste, arte, Phoenix, EinsFestival
diff --git a/util/scan/dvb-t/de-Sachsen-Anhalt b/util/scan/dvb-t/de-Sachsen-Anhalt
index d8582f2..9ff5de3 100644
--- a/util/scan/dvb-t/de-Sachsen-Anhalt
+++ b/util/scan/dvb-t/de-Sachsen-Anhalt
@@ -1,13 +1,13 @@
 # DVB-T Sachsen-Anhalt
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH24: Das Erste, arte, Phoenix, EinsFestival
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL II, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
+T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL 2, Super RTL, VOX, RTL Crime, RTL Passion [Sendenorm: MPEG-4]
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: Das Erste, arte, Phoenix, EinsFestival
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH34: MDR-ST, rbb, NDR, WDR
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH35: MDR-ST, rbb, NDR, WDR
 T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH38: MDR-ST, rbb, NDR, WDR
 T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH41: Das Erste, arte, Phoenix, EinsFestival
+T 746000000 8MHz 2/3 NONE QPSK 8k 1/8 NONE # CH55: TV Halle (Testbetrieb)
diff --git a/util/scan/dvb-t/de-Schleswig-Holstein b/util/scan/dvb-t/de-Schleswig-Holstein
index 18728e1..a4b905e 100644
--- a/util/scan/dvb-t/de-Schleswig-Holstein
+++ b/util/scan/dvb-t/de-Schleswig-Holstein
@@ -1,18 +1,18 @@
 # DVB-T Schleswig-Holstein
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR HH
+T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
+T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
 T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsExtra
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR HH
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Pro7, Sat.1, Kabel1, N24
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
+T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: Pro7, Sat.1, Kabel1, N24
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR HH
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL, RTL II, Super RTL, VOX
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: RTL, RTL II, Super RTL, VOX
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
+T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
+T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL / Guten Abend RTL, RTL 2, Super RTL, VOX
+T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: RTL / Guten Abend RTL, RTL 2, Super RTL, VOX
 T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Das Erste, arte, Phoenix, EinsExtra
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: Neun live, Tele 5, Eurosport, Bibel.TV
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Neun live, Tele 5, Eurosport, Bibel.TV
+T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: Tele 5, SIXX, das Vierte, Bibel TV
+T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Tele 5, SIXX, das Vierte, Bibel TV
diff --git a/util/scan/dvb-t/de-Thueringen b/util/scan/dvb-t/de-Thueringen
index 94bbf2c..887dae8 100644
--- a/util/scan/dvb-t/de-Thueringen
+++ b/util/scan/dvb-t/de-Thueringen
@@ -2,9 +2,9 @@
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH21: Das Erste, arte, Phoenix, EinsFestival
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH25: Das Erste, arte, Phoenix, EinsFestival
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH27: MDR-TH, rbb, hr, BR
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH48: MDR-TH, rbb, hr, BR
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH27: MDR-TH, rbb, hr, Bayerisches Fernsehen
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH48: MDR-TH, rbb, hr, Bayerisches Fernsehen
+T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
 T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH53: Das Erste, arte, Phoenix, EinsFestival
diff --git a/util/scan/dvb-t/dk-All b/util/scan/dvb-t/dk-All
index 61b71be..931b1af 100644
--- a/util/scan/dvb-t/dk-All
+++ b/util/scan/dvb-t/dk-All
@@ -2,16 +2,22 @@
 # Created from http://www.digi-tv.dk/Indhold_og_tilbud/frekvenser.asp
 # and http://www.digi-tv.dk/Sendenettets_opbygning/
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/es-Albacete b/util/scan/dvb-t/es-Albacete
index 26b1e92..7d93802 100644
--- a/util/scan/dvb-t/es-Albacete
+++ b/util/scan/dvb-t/es-Albacete
@@ -1,10 +1,14 @@
-# Spain, Albacete - Update 2009/12/20 (Freud)
+# Spain, Albacete - Update 2010/08/12 (Freud)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 39: La Regional, AB TeVe/TVCM, CRN, La Tribuna TV
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 47: CNC, Vision6, ABTeVe
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 59: La 1, La 2, 24H, Clan, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 63: CMT, CMT2, RCM
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 66: Veo7, Sony TV en Veo, Tienda en Veo, Intereconomía, Teledeporte, Radio Intereconomía, Radio Marca, esRadio, Vaughan Radio
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 67: Cuatro, CNN+, 40 Latino, Canal Club, La Sexta, SER, 40 Principales, Cadena Dial
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, Punto Radio
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 69: Antena 3, Antena.Neox, Antena.Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 37: La Regional, TCM, CRN
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 46: Sogecuatro, laSexta2, laSexta3 (Todos pendientes de asignar)
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 47: CNC, Vision6, ABTeVe, Punto Radio
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 50: Boing, La 10, MTV, Punto Radio
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 53: Nitro, Marca TV, Veo13
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 56: TVE HD, Teledeporte, Pruebas TVE, RNE 1, RNE CLÁSICA, RNE 3
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 59: La 1, La 2, 24H, Clan, RNE1, RNE Clásica, RNE 3
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: CMT, CMT2, RCM
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo7, Tienda en Veo, Intereconomía, AXN, Teledeporte, Radio Intereconomía, Radio Marca, esRadio, Vaughan Radio
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, Canal+ Dos, Canal Club, LaSexta, SER, 40 Principales, Cadena Dial
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, Punto Radio
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Neox, Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía 
diff --git a/util/scan/dvb-t/es-Alfabia b/util/scan/dvb-t/es-Alfabia
index a7e1a5a..5852cef 100644
--- a/util/scan/dvb-t/es-Alfabia
+++ b/util/scan/dvb-t/es-Alfabia
@@ -1,6 +1,8 @@
 # DVB-T Alfabia, Mallorca, Balearic Islands, Spain.
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVM, Canal4, OnaMallorca Radio
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3 Cat, 3/24, 33, Super3/300
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV Mallorca, Canal 4
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Popular TV, TEVEi
 T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.63: 24h, 50 aniv., ClanTV, La 2, TVE1; RNE 1, RNE 3, RNE C; Digitext, EPG, Lanzadera.
 T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.65: IB3, Aprenda Ingles TV
 T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.66: NetTV, Teledeporte, VeoTV1, VeoTV2.
diff --git a/util/scan/dvb-t/es-Donostia b/util/scan/dvb-t/es-Donostia
index b8f233a..fe38efd 100644
--- a/util/scan/dvb-t/es-Donostia
+++ b/util/scan/dvb-t/es-Donostia
@@ -1,14 +1,13 @@
 # The channels with 1/32 guard-interval are French and should be perfectly visible
 # here. However I have only managed to get a lock for the channel 57 of the French ones.
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 32: CNN+, Cuatro, La Sexta 1, 40 Latino TV, EPG Soge V2 5
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 40: Antena 3, Antena.Neox, Antena.Nova, Telehit, Onda Cero, Europa FM, Onda Melodia, A3Lanzadera, A3Portal, EPGA3, A3Ticker
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE   # Canal 42: Direct8, TMC, BFM, iTele, Europe2TV, Gulli
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE   # Canal 49: M6, W9, NT1
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE   # Canal 51: Canal+, Canal+ Cinema, Canal+ Sport
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE   # Canal 57: TF1, NRJ12, Eurosport, TPS Star, LCI
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 60: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gaztea, Radio Etb, TGov, Eguraldi
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 63: TVE1, TVE2, 24H TVE, Clan/TVE 50 anos, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE   # Canal 65: France 2, France 3, France 4, France 5, Arte, LCP
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 66: Net TV, Teledeporte, Veo TV1, Veo TV2, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 68: Fly Music, Tele 5, Tele 5 Estrellas, Tele 5 Sport
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/es-Las_Palmas b/util/scan/dvb-t/es-Las_Palmas
index c68abe3..f260327 100644
--- a/util/scan/dvb-t/es-Las_Palmas
+++ b/util/scan/dvb-t/es-Las_Palmas
@@ -1,8 +1,18 @@
-# Funciona correctamente en Las Palmas de Gran Canaria (24-4-2007)
+# Funciona correctamente en Las Palmas de Gran Canaria (25-09-2010)
+# 
+# Revisada y corregida por el Grupo de Usuarios de Linux de Canarias
+# http://www.gulic.org
+#
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 28: TVE HD, Teledeporte, RNE Clásica, RNE 3
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 32: Boing, Telecinco HD, La 10, MTV, Punto Radio
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 35: Sogecuatro, LaSexta2, LaSexta3
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 38: Nitro, Antena 3 HD, Marca TV, Veo13
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 44: Canal 7 Gran Canaria, TIC Canal 8, Canal 4, RTI
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 52: Localia, Nueve TV, Nueve Radio
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 60: TVE1, TVE2, 24H TVE, Clan/TVE, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 65: TV C, TV C2
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 66: Net TV, Teledeporte, Veo TV1, SETenVeo, Radio Intereconomía Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 67: CNN+, Cuatro, La Sexta 1, 40 Latino TV, EPG Soge V2 5
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 68: Fly Music, Punto Radio, Tele 5, Tele 5 Estrellas, Tele 5 Sport
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 69: Antena 3, Antena.Neox, Antena.Nova, Telehit, Onda Cero, Europa FM, Onda Melodia, A3Lanzadera, A3Portal, EPGA3, A3Ticker
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 65: TV C, TV C2, Antena 3 Canarias, Popular TV, Canarias Radio, Cope, Cadena 100, Radio ECCA, Lanzadera, Ticker, Piloto TDT
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 66: Veo7, Tienda en Veo, AXN, Intereconomia, Teledeporte, Radio Intereconomia, Radio Marca, esRadio, Vaughan Radio, Canal Ingeniería, GUIDE Plus +, C66Gancho, C66Lanzadera, C66EPG, EpgNet
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 67: Cuatro, CNN+, Canal+ Dos, Canal Club, laSexta, SER, 40 Principales, Cadena Dial, Lanzadera, EPG TDT, Ticker, Lanzadera, Noticias, EPG
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, T5Lanzadera, T5Digitext, Noticias, Tiempo, Bolsa, Tráfico
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 69: Antena 3, Neox, Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía, tvtv DIGITAL, A3Lanzadera, A3Portal, A3EPG, A3Ticker, T-seniority, Gol Bar
diff --git a/util/scan/dvb-t/es-Madrid b/util/scan/dvb-t/es-Madrid
index 650436a..56cf68f 100644
--- a/util/scan/dvb-t/es-Madrid
+++ b/util/scan/dvb-t/es-Madrid
@@ -1,8 +1,22 @@
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, IntereconomÃa TV
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20110306 2 0 OFDM ES </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: <add description here>
+# date (yyyy-mm-dd)    : 2011-03-16
+# provided by (opt)    : <your name or email here>
+#
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 570000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE
+T 618000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE # Teledifusion Madrid
+T 706000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE
+T 746000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE # RGE2
+T 770000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE # RGE MADRID
+T 778000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE
+T 810000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE # TDT-CAM
+T 834000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE # SFN
+T 842000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE # SFN
+T 850000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE # SFN
+T 858000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE # SFN
diff --git a/util/scan/dvb-t/es-SC_Tenerife b/util/scan/dvb-t/es-SC_Tenerife
new file mode 100644
index 0000000..0706513
--- /dev/null
+++ b/util/scan/dvb-t/es-SC_Tenerife
@@ -0,0 +1,18 @@
+# Funciona correctamente en Santa Cruz de Tenerife (25-09-2010)
+# 
+# Revisada y corregida por el Grupo de Usuarios de Linux de Canarias
+# http://www.gulic.org
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C23
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C24
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C26
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C29
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C45
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C56
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C59
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C60
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C66
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C67
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C68
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # C69
diff --git a/util/scan/dvb-t/es-Sevilla b/util/scan/dvb-t/es-Sevilla
index 1011dec..0c7361d 100644
--- a/util/scan/dvb-t/es-Sevilla
+++ b/util/scan/dvb-t/es-Sevilla
@@ -1,7 +1,22 @@
-# DVB-T Sevilla (Andalucia)                   by x2 15 Agosto 2006
+# DVB-T Sevilla (Spain) by x2 15-agos-2010, modificado 15-ago-2010
+#                                    thanks to http://www.tdt1.com
+#         thanks to http://wirbel.htpc-forum.de/w_scan/index2.html
 # T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C33
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C36
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C38
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C41
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C44
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C45
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C49
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C52
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C54
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C55
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C56
 T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C57
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C59
 T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C61
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C63
 T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C66
 T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C67
 T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C68
diff --git a/util/scan/dvb-t/es-Tenerife b/util/scan/dvb-t/es-Tenerife
new file mode 100644
index 0000000..71b04be
--- /dev/null
+++ b/util/scan/dvb-t/es-Tenerife
@@ -0,0 +1,14 @@
+# DVB-T Tenerife, Spain (03/04/2011)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 23: laSexta 2, laSexta 3, laSexta HD, C+ 2, Cuatro
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 24: Canal 7, Mírame, Canal 4 Tenerife
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 26: Nitro, Antena 3, Marca, 13
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 29: Boing, Tele5 HD, MTV, La 10
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 45: TVE HD, tdp
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 56: Canal 6 TeideVisión, ElDía
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 59: TV Canaria, TV Canaria 2, Antena 3 Canaria
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 60: La 1, La 2, 24h, Clan
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 66: Teledeporte, Canal Ingeniería, Veo7, Intereconomía
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 67: laSexta, laSexta 3, Gol Televisión, Cuatro, Divinity, La Tienda en Casa
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 68: Tele5, FDF, laSiete, Disney Channel, Intereconomía
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE   # Canal 69: Antena 3, Neox, Nova, Veo7, AXN
diff --git a/util/scan/dvb-t/fi-Aanekoski b/util/scan/dvb-t/fi-Aanekoski
index e1513fe..484a762 100644
--- a/util/scan/dvb-t/fi-Aanekoski
+++ b/util/scan/dvb-t/fi-Aanekoski
@@ -2,5 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Aanekoski_Konginkangas b/util/scan/dvb-t/fi-Aanekoski_Konginkangas
index af7c892..cc095f2 100644
--- a/util/scan/dvb-t/fi-Aanekoski_Konginkangas
+++ b/util/scan/dvb-t/fi-Aanekoski_Konginkangas
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Alajarvi b/util/scan/dvb-t/fi-Alajarvi
index 9704ea5..0df21ae 100644
--- a/util/scan/dvb-t/fi-Alajarvi
+++ b/util/scan/dvb-t/fi-Alajarvi
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Enontekio_Ahovaara_Raattama b/util/scan/dvb-t/fi-Enontekio_Raattama
index 0985bcc..0985bcc 100644
--- a/util/scan/dvb-t/fi-Enontekio_Ahovaara_Raattama
+++ b/util/scan/dvb-t/fi-Enontekio_Raattama
diff --git a/util/scan/dvb-t/fi-Hameenkyro_Kyroskoski b/util/scan/dvb-t/fi-Hameenkyro_Kyroskoski
index 91c5c53..408e9d4 100644
--- a/util/scan/dvb-t/fi-Hameenkyro_Kyroskoski
+++ b/util/scan/dvb-t/fi-Hameenkyro_Kyroskoski
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Hanko b/util/scan/dvb-t/fi-Hanko
index a4430f5..fb5e427 100644
--- a/util/scan/dvb-t/fi-Hanko
+++ b/util/scan/dvb-t/fi-Hanko
@@ -1,5 +1,6 @@
 # automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Hartola b/util/scan/dvb-t/fi-Hartola
index 817b1d4..fac38d7 100644
--- a/util/scan/dvb-t/fi-Hartola
+++ b/util/scan/dvb-t/fi-Hartola
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kuhmo_Tikkasenmaki b/util/scan/dvb-t/fi-Haukela
index 9dbe779..b47f913 100644
--- a/util/scan/dvb-t/fi-Kuhmo_Tikkasenmaki
+++ b/util/scan/dvb-t/fi-Haukela
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Heinavesi b/util/scan/dvb-t/fi-Heinavesi
index 1e26e70..e921f2d 100644
--- a/util/scan/dvb-t/fi-Heinavesi
+++ b/util/scan/dvb-t/fi-Heinavesi
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Heinola b/util/scan/dvb-t/fi-Heinola
index a2e7f14..6b6c815 100644
--- a/util/scan/dvb-t/fi-Heinola
+++ b/util/scan/dvb-t/fi-Heinola
@@ -2,5 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kuusamo_Hamppulampi b/util/scan/dvb-t/fi-Hossa
index 4109350..4109350 100644
--- a/util/scan/dvb-t/fi-Kuusamo_Hamppulampi
+++ b/util/scan/dvb-t/fi-Hossa
diff --git a/util/scan/dvb-t/fi-Houtskari b/util/scan/dvb-t/fi-Houtskari
index 78f636a..6d2fea7 100644
--- a/util/scan/dvb-t/fi-Houtskari
+++ b/util/scan/dvb-t/fi-Houtskari
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Hyrynsalmi b/util/scan/dvb-t/fi-Hyrynsalmi
index cae406a..32b3b5f 100644
--- a/util/scan/dvb-t/fi-Hyrynsalmi
+++ b/util/scan/dvb-t/fi-Hyrynsalmi
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Hyrynsalmi_Kyparavaara b/util/scan/dvb-t/fi-Hyrynsalmi_Kyparavaara
index cae406a..cb9f858 100644
--- a/util/scan/dvb-t/fi-Hyrynsalmi_Kyparavaara
+++ b/util/scan/dvb-t/fi-Hyrynsalmi_Kyparavaara
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Hyrynsalmi_Paljakka b/util/scan/dvb-t/fi-Hyrynsalmi_Paljakka
index afca845..29939d6 100644
--- a/util/scan/dvb-t/fi-Hyrynsalmi_Paljakka
+++ b/util/scan/dvb-t/fi-Hyrynsalmi_Paljakka
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Hyvinkaa_Musta-Mannisto b/util/scan/dvb-t/fi-Hyvinkaa_Musta-Mannisto
index 8776147..62f24e7 100644
--- a/util/scan/dvb-t/fi-Hyvinkaa_Musta-Mannisto
+++ b/util/scan/dvb-t/fi-Hyvinkaa_Musta-Mannisto
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 350000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Ikaalinen b/util/scan/dvb-t/fi-Ikaalinen
index af90345..ee90985 100644
--- a/util/scan/dvb-t/fi-Ikaalinen
+++ b/util/scan/dvb-t/fi-Ikaalinen
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Ikaalinen_Riitiala b/util/scan/dvb-t/fi-Ikaalinen_Riitiala
index 320ef92..783785a 100644
--- a/util/scan/dvb-t/fi-Ikaalinen_Riitiala
+++ b/util/scan/dvb-t/fi-Ikaalinen_Riitiala
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Jalasjarvi b/util/scan/dvb-t/fi-Jalasjarvi
index 0aa1215..9273e81 100644
--- a/util/scan/dvb-t/fi-Jalasjarvi
+++ b/util/scan/dvb-t/fi-Jalasjarvi
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Jamsa_Kaipola b/util/scan/dvb-t/fi-Jamsa_Kaipola
index 7e4cb3b..e872fb6 100644
--- a/util/scan/dvb-t/fi-Jamsa_Kaipola
+++ b/util/scan/dvb-t/fi-Jamsa_Kaipola
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Jamsa_Kuorevesi_Halli b/util/scan/dvb-t/fi-Jamsa_Kuorevesi_Halli
index 0a59e26..e20ef64 100644
--- a/util/scan/dvb-t/fi-Jamsa_Kuorevesi_Halli
+++ b/util/scan/dvb-t/fi-Jamsa_Kuorevesi_Halli
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Jamsa_Ouninpohja b/util/scan/dvb-t/fi-Jamsa_Ouninpohja
index b976550..a22369f 100644
--- a/util/scan/dvb-t/fi-Jamsa_Ouninpohja
+++ b/util/scan/dvb-t/fi-Jamsa_Ouninpohja
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Jamsankoski b/util/scan/dvb-t/fi-Jamsankoski
index dfb94fb..a85ec1e 100644
--- a/util/scan/dvb-t/fi-Jamsankoski
+++ b/util/scan/dvb-t/fi-Jamsankoski
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Joensuu_Vestinkallio b/util/scan/dvb-t/fi-Joensuu_Vestinkallio
index 886380e..bbddf13 100644
--- a/util/scan/dvb-t/fi-Joensuu_Vestinkallio
+++ b/util/scan/dvb-t/fi-Joensuu_Vestinkallio
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Joroinen_Puukkola b/util/scan/dvb-t/fi-Joroinen_Puukkola-Huutokoski
index f600e4b..57cdf25 100644
--- a/util/scan/dvb-t/fi-Joroinen_Puukkola
+++ b/util/scan/dvb-t/fi-Joroinen_Puukkola-Huutokoski
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Joutsa_Lankia b/util/scan/dvb-t/fi-Joutsa_Lankia
index e0c7169..94774af 100644
--- a/util/scan/dvb-t/fi-Joutsa_Lankia
+++ b/util/scan/dvb-t/fi-Joutsa_Lankia
@@ -1,5 +1,6 @@
 # automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Juupajoki_Kopsamo b/util/scan/dvb-t/fi-Juupajoki_Kopsamo
index 095a726..cd85e85 100644
--- a/util/scan/dvb-t/fi-Juupajoki_Kopsamo
+++ b/util/scan/dvb-t/fi-Juupajoki_Kopsamo
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Juva b/util/scan/dvb-t/fi-Juva
new file mode 100644
index 0000000..a1907d8
--- /dev/null
+++ b/util/scan/dvb-t/fi-Juva
@@ -0,0 +1,6 @@
+# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kaavi_Sivakkavaara_Luikonlahti b/util/scan/dvb-t/fi-Kaavi_Luikonlahti
index 3c00447..e4df587 100644
--- a/util/scan/dvb-t/fi-Kaavi_Sivakkavaara_Luikonlahti
+++ b/util/scan/dvb-t/fi-Kaavi_Luikonlahti
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kajaani_Pollyvaara b/util/scan/dvb-t/fi-Kajaani_Pollyvaara
index c560b8c..b647e34 100644
--- a/util/scan/dvb-t/fi-Kajaani_Pollyvaara
+++ b/util/scan/dvb-t/fi-Kajaani_Pollyvaara
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kalajoki b/util/scan/dvb-t/fi-Kalajoki
index 2dfe85a..a0e7e7a 100644
--- a/util/scan/dvb-t/fi-Kalajoki
+++ b/util/scan/dvb-t/fi-Kalajoki
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kangaslampi b/util/scan/dvb-t/fi-Kangaslampi
index 343beb0..7962975 100644
--- a/util/scan/dvb-t/fi-Kangaslampi
+++ b/util/scan/dvb-t/fi-Kangaslampi
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kangasniemi_Turkinmaki b/util/scan/dvb-t/fi-Kangasniemi_Turkinmaki
index 6541b8d..464d13a 100644
--- a/util/scan/dvb-t/fi-Kangasniemi_Turkinmaki
+++ b/util/scan/dvb-t/fi-Kangasniemi_Turkinmaki
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kankaanpaa b/util/scan/dvb-t/fi-Kankaanpaa
index 00813d2..e2057bd 100644
--- a/util/scan/dvb-t/fi-Kankaanpaa
+++ b/util/scan/dvb-t/fi-Kankaanpaa
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Karstula b/util/scan/dvb-t/fi-Karstula
index 2ad386e..ba686aa 100644
--- a/util/scan/dvb-t/fi-Karstula
+++ b/util/scan/dvb-t/fi-Karstula
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Keuruu b/util/scan/dvb-t/fi-Keuruu
index 987e99b..89a30ca 100644
--- a/util/scan/dvb-t/fi-Keuruu
+++ b/util/scan/dvb-t/fi-Keuruu
@@ -2,5 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Keuruu_Haapamaki b/util/scan/dvb-t/fi-Keuruu_Haapamaki
index 904aaf1..7f46106 100644
--- a/util/scan/dvb-t/fi-Keuruu_Haapamaki
+++ b/util/scan/dvb-t/fi-Keuruu_Haapamaki
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kihnio b/util/scan/dvb-t/fi-Kihnio
index bd1c15f..23d5c5c 100644
--- a/util/scan/dvb-t/fi-Kihnio
+++ b/util/scan/dvb-t/fi-Kihnio
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Korpilahti_Vaarunvuori b/util/scan/dvb-t/fi-Korpilahti_Vaarunvuori
index dfb94fb..a85ec1e 100644
--- a/util/scan/dvb-t/fi-Korpilahti_Vaarunvuori
+++ b/util/scan/dvb-t/fi-Korpilahti_Vaarunvuori
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Korppoo b/util/scan/dvb-t/fi-Korppoo
index 78f636a..6d2fea7 100644
--- a/util/scan/dvb-t/fi-Korppoo
+++ b/util/scan/dvb-t/fi-Korppoo
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kuhmo_Iivantiira b/util/scan/dvb-t/fi-Kuhmo_Iivantiira
index 1fe56f2..07407bf 100644
--- a/util/scan/dvb-t/fi-Kuhmo_Iivantiira
+++ b/util/scan/dvb-t/fi-Kuhmo_Iivantiira
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kuhmo_Lentiira b/util/scan/dvb-t/fi-Kuhmo_Lentiira
index 8396dd6..9d0623d 100644
--- a/util/scan/dvb-t/fi-Kuhmo_Lentiira
+++ b/util/scan/dvb-t/fi-Kuhmo_Lentiira
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kuhmoinen b/util/scan/dvb-t/fi-Kuhmoinen
index f1afd7a..bbcd06b 100644
--- a/util/scan/dvb-t/fi-Kuhmoinen
+++ b/util/scan/dvb-t/fi-Kuhmoinen
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kuhmoinen_Harjunsalmi b/util/scan/dvb-t/fi-Kuhmoinen_Harjunsalmi
index 2d8f5a0..933b459 100644
--- a/util/scan/dvb-t/fi-Kuhmoinen_Harjunsalmi
+++ b/util/scan/dvb-t/fi-Kuhmoinen_Harjunsalmi
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kuhmoinen_Puukkoinen b/util/scan/dvb-t/fi-Kuhmoinen_Puukkoinen
index f62c9b7..96611f9 100644
--- a/util/scan/dvb-t/fi-Kuhmoinen_Puukkoinen
+++ b/util/scan/dvb-t/fi-Kuhmoinen_Puukkoinen
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kuopio b/util/scan/dvb-t/fi-Kuopio
index a1b1259..9e71fe9 100644
--- a/util/scan/dvb-t/fi-Kuopio
+++ b/util/scan/dvb-t/fi-Kuopio
@@ -1,6 +1,6 @@
 # automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kustavi_Viherlahti b/util/scan/dvb-t/fi-Kustavi_Viherlahti
index fc51088..187d618 100644
--- a/util/scan/dvb-t/fi-Kustavi_Viherlahti
+++ b/util/scan/dvb-t/fi-Kustavi_Viherlahti
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Kyyjarvi_Noposenaho b/util/scan/dvb-t/fi-Kyyjarvi_Noposenaho
index e3f877e..f006821 100644
--- a/util/scan/dvb-t/fi-Kyyjarvi_Noposenaho
+++ b/util/scan/dvb-t/fi-Kyyjarvi_Noposenaho
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Laukaa b/util/scan/dvb-t/fi-Laukaa
index dfb94fb..a85ec1e 100644
--- a/util/scan/dvb-t/fi-Laukaa
+++ b/util/scan/dvb-t/fi-Laukaa
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Laukaa_Vihtavuori b/util/scan/dvb-t/fi-Laukaa_Vihtavuori
index dfb94fb..a85ec1e 100644
--- a/util/scan/dvb-t/fi-Laukaa_Vihtavuori
+++ b/util/scan/dvb-t/fi-Laukaa_Vihtavuori
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Lavia_Lavianjarvi b/util/scan/dvb-t/fi-Lavia_Lavianjarvi
index 928b425..b6e6dca 100644
--- a/util/scan/dvb-t/fi-Lavia_Lavianjarvi
+++ b/util/scan/dvb-t/fi-Lavia_Lavianjarvi
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Lieksa_Vieki b/util/scan/dvb-t/fi-Lieksa_Konnanvaara
index 1efc9d6..c0ae1fd 100644
--- a/util/scan/dvb-t/fi-Lieksa_Vieki
+++ b/util/scan/dvb-t/fi-Lieksa_Konnanvaara
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Loimaa b/util/scan/dvb-t/fi-Loimaa
index c33efc8..6f77040 100644
--- a/util/scan/dvb-t/fi-Loimaa
+++ b/util/scan/dvb-t/fi-Loimaa
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Luhanka b/util/scan/dvb-t/fi-Luhanka
index da39467..0c3a70e 100644
--- a/util/scan/dvb-t/fi-Luhanka
+++ b/util/scan/dvb-t/fi-Luhanka
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Luopioinen b/util/scan/dvb-t/fi-Luopioinen
index 486d21e..74191d0 100644
--- a/util/scan/dvb-t/fi-Luopioinen
+++ b/util/scan/dvb-t/fi-Luopioinen
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Mantta b/util/scan/dvb-t/fi-Mantta
index 98a821b..561e3c4 100644
--- a/util/scan/dvb-t/fi-Mantta
+++ b/util/scan/dvb-t/fi-Mantta
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Mantyharju b/util/scan/dvb-t/fi-Mantyharju
index adf0234..8ed12f1 100644
--- a/util/scan/dvb-t/fi-Mantyharju
+++ b/util/scan/dvb-t/fi-Mantyharju
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Mustasaari b/util/scan/dvb-t/fi-Mustasaari
new file mode 100644
index 0000000..e73d1d1
--- /dev/null
+++ b/util/scan/dvb-t/fi-Mustasaari
@@ -0,0 +1,3 @@
+# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Suomussalmi_Myllylahti b/util/scan/dvb-t/fi-Myllylahti
index 8c80895..8c80895 100644
--- a/util/scan/dvb-t/fi-Suomussalmi_Myllylahti
+++ b/util/scan/dvb-t/fi-Myllylahti
diff --git a/util/scan/dvb-t/fi-Nilsia b/util/scan/dvb-t/fi-Nilsia
index 49fb2b9..4c5994e 100644
--- a/util/scan/dvb-t/fi-Nilsia
+++ b/util/scan/dvb-t/fi-Nilsia
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Nilsia_Keski-Siikajarvi b/util/scan/dvb-t/fi-Nilsia_Keski-Siikajarvi
index c48b094..b09c019 100644
--- a/util/scan/dvb-t/fi-Nilsia_Keski-Siikajarvi
+++ b/util/scan/dvb-t/fi-Nilsia_Keski-Siikajarvi
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Nilsia_Pisa b/util/scan/dvb-t/fi-Nilsia_Pisa
index 928b425..b14bbbb 100644
--- a/util/scan/dvb-t/fi-Nilsia_Pisa
+++ b/util/scan/dvb-t/fi-Nilsia_Pisa
@@ -1,4 +1,5 @@
 # automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Nokia b/util/scan/dvb-t/fi-Nokia
index fa4e03d..dab2feb 100644
--- a/util/scan/dvb-t/fi-Nokia
+++ b/util/scan/dvb-t/fi-Nokia
@@ -1,6 +1,6 @@
 # automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Nokia_Siuro_Linnavuori b/util/scan/dvb-t/fi-Nokia_Siuro_Linnavuori
index 448e837..dab2feb 100644
--- a/util/scan/dvb-t/fi-Nokia_Siuro_Linnavuori
+++ b/util/scan/dvb-t/fi-Nokia_Siuro_Linnavuori
@@ -1,5 +1,6 @@
 # automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Nummi-Pusula_Hyonola b/util/scan/dvb-t/fi-Nummi-Pusula_Hyonola
index db4ea87..3953482 100644
--- a/util/scan/dvb-t/fi-Nummi-Pusula_Hyonola
+++ b/util/scan/dvb-t/fi-Nummi-Pusula_Hyonola
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Nurmes_Kortevaara b/util/scan/dvb-t/fi-Nurmes_Kortevaara
index 0585576..130a6be 100644
--- a/util/scan/dvb-t/fi-Nurmes_Kortevaara
+++ b/util/scan/dvb-t/fi-Nurmes_Kortevaara
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Orivesi_Langelmaki_Talviainen b/util/scan/dvb-t/fi-Orivesi_Langelmaki_Talviainen
index 86f4254..1f34e37 100644
--- a/util/scan/dvb-t/fi-Orivesi_Langelmaki_Talviainen
+++ b/util/scan/dvb-t/fi-Orivesi_Langelmaki_Talviainen
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Padasjoki b/util/scan/dvb-t/fi-Padasjoki
index a0da8ab..23f3b29 100644
--- a/util/scan/dvb-t/fi-Padasjoki
+++ b/util/scan/dvb-t/fi-Padasjoki
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Padasjoki_Arrakoski b/util/scan/dvb-t/fi-Padasjoki_Arrakoski
index de939c4..e848d26 100644
--- a/util/scan/dvb-t/fi-Padasjoki_Arrakoski
+++ b/util/scan/dvb-t/fi-Padasjoki_Arrakoski
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Paltamo_Kivesvaara b/util/scan/dvb-t/fi-Paltamo_Kivesvaara
index ff6a17a..ca2c8af 100644
--- a/util/scan/dvb-t/fi-Paltamo_Kivesvaara
+++ b/util/scan/dvb-t/fi-Paltamo_Kivesvaara
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Parikkala b/util/scan/dvb-t/fi-Parikkala
index 7b87891..50d5cd6 100644
--- a/util/scan/dvb-t/fi-Parikkala
+++ b/util/scan/dvb-t/fi-Parikkala
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Parkano b/util/scan/dvb-t/fi-Parkano_Sopukallio
index 9bcd629..3b1f1ef 100644
--- a/util/scan/dvb-t/fi-Parkano
+++ b/util/scan/dvb-t/fi-Parkano_Sopukallio
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Perho b/util/scan/dvb-t/fi-Perho
index de89309..4afc01b 100644
--- a/util/scan/dvb-t/fi-Perho
+++ b/util/scan/dvb-t/fi-Perho
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Pieksamaki_Halkokumpu b/util/scan/dvb-t/fi-Pieksamaki_Halkokumpu
index de3fed1..a761396 100644
--- a/util/scan/dvb-t/fi-Pieksamaki_Halkokumpu
+++ b/util/scan/dvb-t/fi-Pieksamaki_Halkokumpu
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Porvoo_Suomenkyla b/util/scan/dvb-t/fi-Porvoo_Suomenkyla
index d63da78..2b4b8f8 100644
--- a/util/scan/dvb-t/fi-Porvoo_Suomenkyla
+++ b/util/scan/dvb-t/fi-Porvoo_Suomenkyla
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Pudasjarvi b/util/scan/dvb-t/fi-Pudasjarvi
index 5ff8ecf..fd93b50 100644
--- a/util/scan/dvb-t/fi-Pudasjarvi
+++ b/util/scan/dvb-t/fi-Pudasjarvi
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Pudasjarvi_Kangasvaara b/util/scan/dvb-t/fi-Pudasjarvi_Hirvaskoski
index a550248..a550248 100644
--- a/util/scan/dvb-t/fi-Pudasjarvi_Kangasvaara
+++ b/util/scan/dvb-t/fi-Pudasjarvi_Hirvaskoski
diff --git a/util/scan/dvb-t/fi-Pudasjarvi_Iso-Syote b/util/scan/dvb-t/fi-Pudasjarvi_Iso-Syote
index 7281f29..875af2f 100644
--- a/util/scan/dvb-t/fi-Pudasjarvi_Iso-Syote
+++ b/util/scan/dvb-t/fi-Pudasjarvi_Iso-Syote
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Puolanka b/util/scan/dvb-t/fi-Puolanka
index 5b611d5..5d85ca5 100644
--- a/util/scan/dvb-t/fi-Puolanka
+++ b/util/scan/dvb-t/fi-Puolanka
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Pyhatunturi b/util/scan/dvb-t/fi-Pyhatunturi
index 54c59f2..7f586e6 100644
--- a/util/scan/dvb-t/fi-Pyhatunturi
+++ b/util/scan/dvb-t/fi-Pyhatunturi
@@ -1,4 +1,4 @@
 # automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Pylkonmaki_Karankajarvi b/util/scan/dvb-t/fi-Pylkonmaki_Karankajarvi
index 9577e38..de37e88 100644
--- a/util/scan/dvb-t/fi-Pylkonmaki_Karankajarvi
+++ b/util/scan/dvb-t/fi-Pylkonmaki_Karankajarvi
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Raahe_Mestauskallio b/util/scan/dvb-t/fi-Raahe_Mestauskallio
index 30f86c6..498542c 100644
--- a/util/scan/dvb-t/fi-Raahe_Mestauskallio
+++ b/util/scan/dvb-t/fi-Raahe_Mestauskallio
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Raahe_Piehinki b/util/scan/dvb-t/fi-Raahe_Piehinki
index 2dfe85a..a0e7e7a 100644
--- a/util/scan/dvb-t/fi-Raahe_Piehinki
+++ b/util/scan/dvb-t/fi-Raahe_Piehinki
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Rautavaara_Angervikko b/util/scan/dvb-t/fi-Rautavaara_Angervikko
index b2e176e..6349073 100644
--- a/util/scan/dvb-t/fi-Rautavaara_Angervikko
+++ b/util/scan/dvb-t/fi-Rautavaara_Angervikko
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Rautjarvi_Simpele b/util/scan/dvb-t/fi-Rautjarvi_Simpele
index 1825663..e515554 100644
--- a/util/scan/dvb-t/fi-Rautjarvi_Simpele
+++ b/util/scan/dvb-t/fi-Rautjarvi_Simpele
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Ristijarvi b/util/scan/dvb-t/fi-Ristijarvi
index f0aa969..65ee42d 100644
--- a/util/scan/dvb-t/fi-Ristijarvi
+++ b/util/scan/dvb-t/fi-Ristijarvi
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Rovaniemi_Karhuvaara_Marrasjarvi b/util/scan/dvb-t/fi-Rovaniemi_Marrasjarvi
index fd29f57..fd29f57 100644
--- a/util/scan/dvb-t/fi-Rovaniemi_Karhuvaara_Marrasjarvi
+++ b/util/scan/dvb-t/fi-Rovaniemi_Marrasjarvi
diff --git a/util/scan/dvb-t/fi-Ruovesi_Storminiemi b/util/scan/dvb-t/fi-Ruovesi_Storminiemi
index 91c5c53..408e9d4 100644
--- a/util/scan/dvb-t/fi-Ruovesi_Storminiemi
+++ b/util/scan/dvb-t/fi-Ruovesi_Storminiemi
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Saarijarvi b/util/scan/dvb-t/fi-Saarijarvi
index 5096705..a5a503b 100644
--- a/util/scan/dvb-t/fi-Saarijarvi
+++ b/util/scan/dvb-t/fi-Saarijarvi
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Saarijarvi_Kalmari b/util/scan/dvb-t/fi-Saarijarvi_Kalmari
index 9577e38..de37e88 100644
--- a/util/scan/dvb-t/fi-Saarijarvi_Kalmari
+++ b/util/scan/dvb-t/fi-Saarijarvi_Kalmari
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Saarijarvi_Mahlu b/util/scan/dvb-t/fi-Saarijarvi_Mahlu
index afca845..263c6e3 100644
--- a/util/scan/dvb-t/fi-Saarijarvi_Mahlu
+++ b/util/scan/dvb-t/fi-Saarijarvi_Mahlu
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Savukoski_Martti_Haarahonganmaa b/util/scan/dvb-t/fi-Savukoski_Martti
index 8af05b6..8af05b6 100644
--- a/util/scan/dvb-t/fi-Savukoski_Martti_Haarahonganmaa
+++ b/util/scan/dvb-t/fi-Savukoski_Martti
diff --git a/util/scan/dvb-t/fi-Siilinjarvi b/util/scan/dvb-t/fi-Siilinjarvi
index 0d81662..c8ef6df 100644
--- a/util/scan/dvb-t/fi-Siilinjarvi
+++ b/util/scan/dvb-t/fi-Siilinjarvi
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Sipoo_Norrkulla b/util/scan/dvb-t/fi-Sipoo_Norrkulla
index 01746cd..dcc9e4c 100644
--- a/util/scan/dvb-t/fi-Sipoo_Norrkulla
+++ b/util/scan/dvb-t/fi-Sipoo_Norrkulla
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Sulkava_Vaatalanmaki b/util/scan/dvb-t/fi-Sulkava_Vaatalanmaki
index a232b78..30982d5 100644
--- a/util/scan/dvb-t/fi-Sulkava_Vaatalanmaki
+++ b/util/scan/dvb-t/fi-Sulkava_Vaatalanmaki
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Sysma_Liikola b/util/scan/dvb-t/fi-Sysma_Liikola
index 17dead4..5a5803d 100644
--- a/util/scan/dvb-t/fi-Sysma_Liikola
+++ b/util/scan/dvb-t/fi-Sysma_Liikola
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Tammisaari b/util/scan/dvb-t/fi-Tammisaari
index 000c034..832a3f2 100644
--- a/util/scan/dvb-t/fi-Tammisaari
+++ b/util/scan/dvb-t/fi-Tammisaari
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Uusikaupunki_Orivo b/util/scan/dvb-t/fi-Uusikaupunki_Orivo
index 1bf70a6..53bb653 100644
--- a/util/scan/dvb-t/fi-Uusikaupunki_Orivo
+++ b/util/scan/dvb-t/fi-Uusikaupunki_Orivo
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Jyvaskylan_mlk_Vaajakoski b/util/scan/dvb-t/fi-Vaajakoski
index 632acb4..ccab556 100644
--- a/util/scan/dvb-t/fi-Jyvaskylan_mlk_Vaajakoski
+++ b/util/scan/dvb-t/fi-Vaajakoski
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Vaala b/util/scan/dvb-t/fi-Vaala
index 19faff0..2e8851e 100644
--- a/util/scan/dvb-t/fi-Vaala
+++ b/util/scan/dvb-t/fi-Vaala
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Valtimo b/util/scan/dvb-t/fi-Valtimo
index a2f2df0..7328143 100644
--- a/util/scan/dvb-t/fi-Valtimo
+++ b/util/scan/dvb-t/fi-Valtimo
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Vammala_Jyranvuori b/util/scan/dvb-t/fi-Vammala_Jyranvuori
index de944ae..8753665 100644
--- a/util/scan/dvb-t/fi-Vammala_Jyranvuori
+++ b/util/scan/dvb-t/fi-Vammala_Jyranvuori
@@ -1,5 +1,6 @@
 # automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Vammala_Roismala b/util/scan/dvb-t/fi-Vammala_Roismala
index 80fcc91..8c9a0e3 100644
--- a/util/scan/dvb-t/fi-Vammala_Roismala
+++ b/util/scan/dvb-t/fi-Vammala_Roismala
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Vammala_Savi b/util/scan/dvb-t/fi-Vammala_Savi
index 5ae4303..fd4b3b4 100644
--- a/util/scan/dvb-t/fi-Vammala_Savi
+++ b/util/scan/dvb-t/fi-Vammala_Savi
@@ -2,3 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Varpaisjarvi_Honkamaki b/util/scan/dvb-t/fi-Varpaisjarvi_Honkamaki
index c060467..afa9802 100644
--- a/util/scan/dvb-t/fi-Varpaisjarvi_Honkamaki
+++ b/util/scan/dvb-t/fi-Varpaisjarvi_Honkamaki
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Virrat_Lappavuori b/util/scan/dvb-t/fi-Virrat_Lappavuori
index d661fde..f39307d 100644
--- a/util/scan/dvb-t/fi-Virrat_Lappavuori
+++ b/util/scan/dvb-t/fi-Virrat_Lappavuori
@@ -2,4 +2,5 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fr-Abbeville b/util/scan/dvb-t/fr-Abbeville
deleted file mode 100644
index d4de766..0000000
--- a/util/scan/dvb-t/fr-Abbeville
+++ /dev/null
@@ -1,25 +0,0 @@
-# Abbeville - France (DVB-T transmitter of Abbeville ( LaMotte ) )
-# Abbeville - France (signal DVB-T transmis depuis l'émetteur de LaMotte )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Abbeville - LaMotte ####
-#R1
-T 506000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 570000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Agen b/util/scan/dvb-t/fr-Agen
deleted file mode 100644
index 3a5798a..0000000
--- a/util/scan/dvb-t/fr-Agen
+++ /dev/null
@@ -1,25 +0,0 @@
-# Agen - France (DVB-T transmitter of Agen ( Agglomération ) )
-# Agen - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Agen - Agglomération ####
-#R1
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Ajaccio b/util/scan/dvb-t/fr-Ajaccio
deleted file mode 100644
index d179961..0000000
--- a/util/scan/dvb-t/fr-Ajaccio
+++ /dev/null
@@ -1,25 +0,0 @@
-# Ajaccio - France (DVB-T transmitter of Ajaccio ( Baied'Ajaccio ) )
-# Ajaccio - France (signal DVB-T transmis depuis l'émetteur de Baied'Ajaccio )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Ajaccio - Baied'Ajaccio ####
-#R1
-T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Albi b/util/scan/dvb-t/fr-Albi
deleted file mode 100644
index e847d24..0000000
--- a/util/scan/dvb-t/fr-Albi
+++ /dev/null
@@ -1,25 +0,0 @@
-# Albi - France (DVB-T transmitter of Albi ( Agglomération ) )
-# Albi - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Albi - Agglomération ####
-#R1
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 754000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 818000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Alençon b/util/scan/dvb-t/fr-Alençon
deleted file mode 100644
index 73747f7..0000000
--- a/util/scan/dvb-t/fr-Alençon
+++ /dev/null
@@ -1,25 +0,0 @@
-# Alençon - France (DVB-T transmitter of Alençon ( Montsd'Amain ) )
-# Alençon - France (signal DVB-T transmis depuis l'émetteur de Montsd'Amain )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Alençon - Montsd'Amain ####
-#R1
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 826000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Ales b/util/scan/dvb-t/fr-Ales
deleted file mode 100644
index d467996..0000000
--- a/util/scan/dvb-t/fr-Ales
+++ /dev/null
@@ -1,25 +0,0 @@
-# Alès - France (DVB-T transmitter of Alès ( Agglomération ) )
-# Alès - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Alès - Agglomération ####
-#R1
-T 626000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 650000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Ales-Bouquet b/util/scan/dvb-t/fr-Ales-Bouquet
deleted file mode 100644
index d5c176f..0000000
--- a/util/scan/dvb-t/fr-Ales-Bouquet
+++ /dev/null
@@ -1,25 +0,0 @@
-# Alès - France (DVB-T transmitter of Alès ( MontBouquet ) )
-# Alès - France (signal DVB-T transmis depuis l'émetteur de MontBouquet )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Alès - MontBouquet ####
-#R1
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Amiens b/util/scan/dvb-t/fr-Amiens
deleted file mode 100644
index b4e06b4..0000000
--- a/util/scan/dvb-t/fr-Amiens
+++ /dev/null
@@ -1,25 +0,0 @@
-# Amiens - France (DVB-T transmitter of Amiens ( LesSaintJust ) )
-# Amiens - France (signal DVB-T transmis depuis l'émetteur de LesSaintJust )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Amiens - LesSaintJust ####
-#R1
-T 594000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 650000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 626000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Angers b/util/scan/dvb-t/fr-Angers
deleted file mode 100644
index 18abe02..0000000
--- a/util/scan/dvb-t/fr-Angers
+++ /dev/null
@@ -1,25 +0,0 @@
-# Angers - France (DVB-T transmitter of Angers ( RochefortsurLoire ) )
-# Angers - France (signal DVB-T transmis depuis l'émetteur de RochefortsurLoire )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Angers - RochefortsurLoire ####
-#R1
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 626000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 754000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 650000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Annecy b/util/scan/dvb-t/fr-Annecy
deleted file mode 100644
index 02da6a3..0000000
--- a/util/scan/dvb-t/fr-Annecy
+++ /dev/null
@@ -1,25 +0,0 @@
-# Annecy - France (DVB-T transmitter of Annecy ( Agglomération ) )
-# Annecy - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Annecy - Agglomération ####
-#R1
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 482000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 530000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 506000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 834000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Arcachon b/util/scan/dvb-t/fr-Arcachon
deleted file mode 100644
index 1e7f959..0000000
--- a/util/scan/dvb-t/fr-Arcachon
+++ /dev/null
@@ -1,25 +0,0 @@
-# Arcachon - France (DVB-T transmitter of Arcachon ( Agglomération ) )
-# Arcachon - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Arcachon - Agglomération ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Argenton b/util/scan/dvb-t/fr-Argenton
deleted file mode 100644
index f9db8b6..0000000
--- a/util/scan/dvb-t/fr-Argenton
+++ /dev/null
@@ -1,25 +0,0 @@
-# Argenton - France (DVB-T transmitter of Argenton ( Malicornay ) )
-# Argenton - France (signal DVB-T transmis depuis l'émetteur de Malicornay )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Argenton - Malicornay ####
-#R1
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 594000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Aubenas b/util/scan/dvb-t/fr-Aubenas
deleted file mode 100644
index 0ac067e..0000000
--- a/util/scan/dvb-t/fr-Aubenas
+++ /dev/null
@@ -1,25 +0,0 @@
-# Aubenas - France (DVB-T transmitter of Aubenas ( Nord ) )
-# Aubenas - France (signal DVB-T transmis depuis l'émetteur de Nord )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Aubenas - Nord ####
-#R1
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 626000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 650000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Aurillac b/util/scan/dvb-t/fr-Aurillac
deleted file mode 100644
index 9537c43..0000000
--- a/util/scan/dvb-t/fr-Aurillac
+++ /dev/null
@@ -1,25 +0,0 @@
-# Aurillac - France (DVB-T transmitter of Aurillac ( Agglomération ) )
-# Aurillac - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Aurillac - Agglomération ####
-#R1
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Autun b/util/scan/dvb-t/fr-Autun
deleted file mode 100644
index 83baa2c..0000000
--- a/util/scan/dvb-t/fr-Autun
+++ /dev/null
@@ -1,25 +0,0 @@
-# Autun - France (DVB-T transmitter of Autun ( BoisduRoi ) )
-# Autun - France (signal DVB-T transmis depuis l'émetteur de BoisduRoi )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Autun - BoisduRoi ####
-#R1
-T 682000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 834000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 850000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Auxerre b/util/scan/dvb-t/fr-Auxerre
deleted file mode 100644
index 4436ca9..0000000
--- a/util/scan/dvb-t/fr-Auxerre
+++ /dev/null
@@ -1,25 +0,0 @@
-# Auxerre - France (DVB-T transmitter of Auxerre ( Molesmes ) )
-# Auxerre - France (signal DVB-T transmis depuis l'émetteur de Molesmes )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Auxerre - Molesmes ####
-#R1
-T 570000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 794000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Avignon b/util/scan/dvb-t/fr-Avignon
deleted file mode 100644
index 32aeeaf..0000000
--- a/util/scan/dvb-t/fr-Avignon
+++ /dev/null
@@ -1,25 +0,0 @@
-# Avignon - France (DVB-T transmitter of Avignon ( MontVentoux ) )
-# Avignon - France (signal DVB-T transmis depuis l'émetteur de MontVentoux )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Avignon - MontVentoux ####
-#R1
-T 650000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-BarleDuc b/util/scan/dvb-t/fr-BarleDuc
deleted file mode 100644
index 47b7c0a..0000000
--- a/util/scan/dvb-t/fr-BarleDuc
+++ /dev/null
@@ -1,25 +0,0 @@
-# BarleDuc - France (DVB-T transmitter of BarleDuc ( Willeroncourt ) )
-# BarleDuc - France (signal DVB-T transmis depuis l'émetteur de Willeroncourt )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### BarleDuc - Willeroncourt ####
-#R1
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 682000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 658000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Bastia b/util/scan/dvb-t/fr-Bastia
deleted file mode 100644
index 36dec27..0000000
--- a/util/scan/dvb-t/fr-Bastia
+++ /dev/null
@@ -1,25 +0,0 @@
-# Bastia - France (DVB-T transmitter of Bastia ( SerradiPigno ) )
-# Bastia - France (signal DVB-T transmis depuis l'émetteur de SerradiPigno )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Bastia - SerradiPigno ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 626000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Bayonne b/util/scan/dvb-t/fr-Bayonne
deleted file mode 100644
index ada99fc..0000000
--- a/util/scan/dvb-t/fr-Bayonne
+++ /dev/null
@@ -1,25 +0,0 @@
-# Bayonne - France (DVB-T transmitter of Bayonne ( LaRhune ) )
-# Bayonne - France (signal DVB-T transmis depuis l'émetteur de LaRhune )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Bayonne - LaRhune ####
-#R1
-T 826000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Bergerac b/util/scan/dvb-t/fr-Bergerac
deleted file mode 100644
index 5cbaf85..0000000
--- a/util/scan/dvb-t/fr-Bergerac
+++ /dev/null
@@ -1,25 +0,0 @@
-# Bergerac - France (DVB-T transmitter of Bergerac ( Audrix ) )
-# Bergerac - France (signal DVB-T transmis depuis l'émetteur de Audrix )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Bergerac - Audrix ####
-#R1
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 482000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 570000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Besançon b/util/scan/dvb-t/fr-Besançon
deleted file mode 100644
index 08d1a68..0000000
--- a/util/scan/dvb-t/fr-Besançon
+++ /dev/null
@@ -1,25 +0,0 @@
-# Besançon - France (DVB-T transmitter of Besançon ( Brégille ) )
-# Besançon - France (signal DVB-T transmis depuis l'émetteur de Brégille )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Besançon - Brégille ####
-#R1
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Bordeaux-Bouliac b/util/scan/dvb-t/fr-Bordeaux-Bouliac
deleted file mode 100644
index 8017d4e..0000000
--- a/util/scan/dvb-t/fr-Bordeaux-Bouliac
+++ /dev/null
@@ -1,25 +0,0 @@
-# Bordeaux - France (DVB-T transmitter of Bordeaux ( BordeauxEst ) )
-# Bordeaux - France (signal DVB-T transmis depuis l'émetteur de BordeauxEst )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Bordeaux - BordeauxEst ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 658000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Bordeaux-Cauderan b/util/scan/dvb-t/fr-Bordeaux-Cauderan
deleted file mode 100644
index 3733231..0000000
--- a/util/scan/dvb-t/fr-Bordeaux-Cauderan
+++ /dev/null
@@ -1,25 +0,0 @@
-# Bordeaux - France (DVB-T transmitter of Bordeaux ( Caudéran ) )
-# Bordeaux - France (signal DVB-T transmis depuis l'émetteur de Caudéran )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Bordeaux - Caudéran ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 482000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 594000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Boulogne b/util/scan/dvb-t/fr-Boulogne
deleted file mode 100644
index 644172b..0000000
--- a/util/scan/dvb-t/fr-Boulogne
+++ /dev/null
@@ -1,25 +0,0 @@
-# Boulogne - France (DVB-T transmitter of Boulogne ( MontLambert ) )
-# Boulogne - France (signal DVB-T transmis depuis l'émetteur de MontLambert )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Boulogne - MontLambert ####
-#R1
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 626000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Bourges b/util/scan/dvb-t/fr-Bourges
deleted file mode 100644
index a99105b..0000000
--- a/util/scan/dvb-t/fr-Bourges
+++ /dev/null
@@ -1,25 +0,0 @@
-# Bourges - France (DVB-T transmitter of Bourges ( CollinesduSancerrois ) )
-# Bourges - France (signal DVB-T transmis depuis l'émetteur de CollinesduSancerrois )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Bourges - CollinesduSancerrois ####
-#R1
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 498000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 522000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Brest b/util/scan/dvb-t/fr-Brest
deleted file mode 100644
index e16fe38..0000000
--- a/util/scan/dvb-t/fr-Brest
+++ /dev/null
@@ -1,9 +0,0 @@
-# Brest - France
-# Emetteur du Roch Tredudon
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 482000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 506000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 490000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 530000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 514000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Brive b/util/scan/dvb-t/fr-Brive
deleted file mode 100644
index 7b3ce53..0000000
--- a/util/scan/dvb-t/fr-Brive
+++ /dev/null
@@ -1,25 +0,0 @@
-# Brive - France (DVB-T transmitter of Brive ( Lissac ) )
-# Brive - France (signal DVB-T transmis depuis l'émetteur de Lissac )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Brive - Lissac ####
-#R1
-T 530000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 658000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 682000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Caen b/util/scan/dvb-t/fr-Caen
deleted file mode 100644
index d82bd89..0000000
--- a/util/scan/dvb-t/fr-Caen
+++ /dev/null
@@ -1,25 +0,0 @@
-# Caen - France (DVB-T transmitter of Caen ( CaenNord ) )
-# Caen - France (signal DVB-T transmis depuis l'émetteur de CaenNord )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Caen - CaenNord ####
-#R1
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 570000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Caen-Pincon b/util/scan/dvb-t/fr-Caen-Pincon
deleted file mode 100644
index a749b05..0000000
--- a/util/scan/dvb-t/fr-Caen-Pincon
+++ /dev/null
@@ -1,25 +0,0 @@
-# Caen - France (DVB-T transmitter of Caen ( MontPinçon ) )
-# Caen - France (signal DVB-T transmis depuis l'émetteur de MontPinçon )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Caen - MontPinçon ####
-#R1
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Cannes b/util/scan/dvb-t/fr-Cannes
deleted file mode 100644
index 2f841af..0000000
--- a/util/scan/dvb-t/fr-Cannes
+++ /dev/null
@@ -1,25 +0,0 @@
-# Cannes - France (DVB-T transmitter of Cannes ( Vallauris ) )
-# Cannes - France (signal DVB-T transmis depuis l'émetteur de Vallauris )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Cannes - Vallauris ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Carcassonne b/util/scan/dvb-t/fr-Carcassonne
deleted file mode 100644
index f5545b8..0000000
--- a/util/scan/dvb-t/fr-Carcassonne
+++ /dev/null
@@ -1,25 +0,0 @@
-# Carcassonne - France (DVB-T transmitter of Carcassonne ( MontagneNoire ) )
-# Carcassonne - France (signal DVB-T transmis depuis l'émetteur de MontagneNoire )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Carcassonne - MontagneNoire ####
-#R1
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Chambery b/util/scan/dvb-t/fr-Chambery
deleted file mode 100644
index caf0eee..0000000
--- a/util/scan/dvb-t/fr-Chambery
+++ /dev/null
@@ -1,30 +0,0 @@
-# Chambéry - France (DVB-T transmitter of Chambéry ( Nondéfini ) )
-# Chambéry - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Chambéry - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Chambéry n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Chartres b/util/scan/dvb-t/fr-Chartres
deleted file mode 100644
index 0207b84..0000000
--- a/util/scan/dvb-t/fr-Chartres
+++ /dev/null
@@ -1,25 +0,0 @@
-# Chartres - France (DVB-T transmitter of Chartres ( Montlandon ) )
-# Chartres - France (signal DVB-T transmis depuis l'émetteur de Montlandon )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Chartres - Montlandon ####
-#R1
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 754000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Chennevieres b/util/scan/dvb-t/fr-Chennevieres
deleted file mode 100644
index 253f5bf..0000000
--- a/util/scan/dvb-t/fr-Chennevieres
+++ /dev/null
@@ -1,25 +0,0 @@
-# ParisEst - France (DVB-T transmitter of ParisEst ( Chennevières ) )
-# ParisEst - France (signal DVB-T transmis depuis l'émetteur de Chennevières )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### ParisEst - Chennevières ####
-#R1
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Cherbourg b/util/scan/dvb-t/fr-Cherbourg
deleted file mode 100644
index 21be7f5..0000000
--- a/util/scan/dvb-t/fr-Cherbourg
+++ /dev/null
@@ -1,25 +0,0 @@
-# Cherbourg - France (DVB-T transmitter of Cherbourg ( Digosville ) )
-# Cherbourg - France (signal DVB-T transmis depuis l'émetteur de Digosville )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Cherbourg - Digosville ####
-#R1
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-ClermontFerrand b/util/scan/dvb-t/fr-ClermontFerrand
deleted file mode 100644
index 4610b61..0000000
--- a/util/scan/dvb-t/fr-ClermontFerrand
+++ /dev/null
@@ -1,25 +0,0 @@
-# Clermont-Ferrand - France (DVB-T transmitter of Clermont-Ferrand ( PuydeDôme ) )
-# Clermont-Ferrand - France (signal DVB-T transmis depuis l'émetteur de PuydeDôme )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Clermont-Ferrand - PuydeDôme ####
-#R1
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Cluses b/util/scan/dvb-t/fr-Cluses
deleted file mode 100644
index 95d52ea..0000000
--- a/util/scan/dvb-t/fr-Cluses
+++ /dev/null
@@ -1,23 +0,0 @@
-# Cluses - France (DVB-T transmitter of Cluses ( St Sigismond ) )
-# Cluses - France (signal DVB-T transmis depuis l'émetteur de St Sigismond )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Cluses - Nondéfini ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Dieppe b/util/scan/dvb-t/fr-Dieppe
deleted file mode 100644
index b059bae..0000000
--- a/util/scan/dvb-t/fr-Dieppe
+++ /dev/null
@@ -1,25 +0,0 @@
-# Dieppe - France (DVB-T transmitter of Dieppe ( Neuville ) )
-# Dieppe - France (signal DVB-T transmis depuis l'émetteur de Neuville )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Dieppe - Neuville ####
-#R1
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Dijon b/util/scan/dvb-t/fr-Dijon
deleted file mode 100644
index f9f288b..0000000
--- a/util/scan/dvb-t/fr-Dijon
+++ /dev/null
@@ -1,28 +0,0 @@
-# Dijon - France (DVB-T transmitter of Dijon ( Nuit Saint Georges ) )
-# Dijon - France (signal DVB-T transmis depuis l'émetteur de Nuit Saint Georges )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# Fichier mis à jour par Maxence Antonczyk <maxantz@yahoo.fr>
-# le Dimanche 7 Septembre 2008, à 13h00
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Dijon - Nuit Saint Georges ####
-#R1 (France 2,France 3,France 5,Arte,LCP/Public Sénat, Chaîne Locale)
-T 506000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2 (I-Télé,BFM TV,Direct 8,Gulli,Virgin 17,France 4)
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3 (Canal+,Canal+ Cinéma,Canal+ Sport,Planète,Canal J,TPS Star)
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4 (M6,W9,NT1,TF6,Paris Première, AB1)
-T 834000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6 (TF1,TNC,NRJ 12,LCI,Eurosport France)
-T 530000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Dunkerque b/util/scan/dvb-t/fr-Dunkerque
deleted file mode 100644
index 58ad7b6..0000000
--- a/util/scan/dvb-t/fr-Dunkerque
+++ /dev/null
@@ -1,30 +0,0 @@
-# Dunkerque - France (DVB-T transmitter of Dunkerque ( Nondéfini ) )
-# Dunkerque - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Dunkerque - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Dunkerque n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Epinal b/util/scan/dvb-t/fr-Epinal
deleted file mode 100644
index b3cf1e3..0000000
--- a/util/scan/dvb-t/fr-Epinal
+++ /dev/null
@@ -1,25 +0,0 @@
-# Epinal - France (DVB-T transmitter of Epinal ( BoisdelaVierge ) )
-# Epinal - France (signal DVB-T transmis depuis l'émetteur de BoisdelaVierge )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Epinal - BoisdelaVierge ####
-#R1
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 682000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 754000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Evreux b/util/scan/dvb-t/fr-Evreux
deleted file mode 100644
index 64da79f..0000000
--- a/util/scan/dvb-t/fr-Evreux
+++ /dev/null
@@ -1,25 +0,0 @@
-# Evreux - France (DVB-T transmitter of Evreux ( Netreville ) )
-# Evreux - France (signal DVB-T transmis depuis l'émetteur de Netreville )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Evreux - Netreville ####
-#R1
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 626000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 650000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Forbach b/util/scan/dvb-t/fr-Forbach
deleted file mode 100644
index 8ed748a..0000000
--- a/util/scan/dvb-t/fr-Forbach
+++ /dev/null
@@ -1,30 +0,0 @@
-# Forbach - France (DVB-T transmitter of Forbach ( Nondéfini ) )
-# Forbach - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Forbach - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Forbach n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Gex b/util/scan/dvb-t/fr-Gex
deleted file mode 100644
index 1d5f0dd..0000000
--- a/util/scan/dvb-t/fr-Gex
+++ /dev/null
@@ -1,30 +0,0 @@
-# Gex - France (DVB-T transmitter of Gex ( Nondéfini ) )
-# Gex - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Gex - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Gex n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Grenoble b/util/scan/dvb-t/fr-Grenoble
deleted file mode 100644
index 94103f0..0000000
--- a/util/scan/dvb-t/fr-Grenoble
+++ /dev/null
@@ -1,25 +0,0 @@
-# Grenoble - France (DVB-T transmitter of Grenoble ( ToursansVenin ) )
-# Grenoble - France (signal DVB-T transmis depuis l'émetteur de ToursansVenin )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Grenoble - ToursansVenin ####
-#R1
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 474000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 498000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 522000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Gueret b/util/scan/dvb-t/fr-Gueret
deleted file mode 100644
index 0704ef6..0000000
--- a/util/scan/dvb-t/fr-Gueret
+++ /dev/null
@@ -1,25 +0,0 @@
-# Guéret - France (DVB-T transmitter of Guéret ( StLégerleGueretois ) )
-# Guéret - France (signal DVB-T transmis depuis l'émetteur de StLégerleGueretois )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Guéret - StLégerleGueretois ####
-#R1
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Hirson b/util/scan/dvb-t/fr-Hirson
deleted file mode 100644
index a3c244d..0000000
--- a/util/scan/dvb-t/fr-Hirson
+++ /dev/null
@@ -1,30 +0,0 @@
-# Hirson - France (DVB-T transmitter of Hirson ( Nondéfini ) )
-# Hirson - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Hirson - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Hirson n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Hyeres b/util/scan/dvb-t/fr-Hyeres
deleted file mode 100644
index 6dbb93d..0000000
--- a/util/scan/dvb-t/fr-Hyeres
+++ /dev/null
@@ -1,25 +0,0 @@
-# Hyères - France (DVB-T transmitter of Hyères ( CapBenat ) )
-# Hyères - France (signal DVB-T transmis depuis l'émetteur de CapBenat )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Hyères - CapBenat ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-LaRochelle b/util/scan/dvb-t/fr-LaRochelle
deleted file mode 100644
index 309f4a9..0000000
--- a/util/scan/dvb-t/fr-LaRochelle
+++ /dev/null
@@ -1,25 +0,0 @@
-# Rochelle(La) - France (DVB-T transmitter of Rochelle(La) ( Mireuil ) )
-# Rochelle(La) - France (signal DVB-T transmis depuis l'émetteur de Mireuil )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Rochelle(La) - Mireuil ####
-#R1
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 754000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Laval b/util/scan/dvb-t/fr-Laval
deleted file mode 100644
index d97f04c..0000000
--- a/util/scan/dvb-t/fr-Laval
+++ /dev/null
@@ -1,25 +0,0 @@
-# Laval - France (DVB-T transmitter of Laval ( MontRochard ) )
-# Laval - France (signal DVB-T transmis depuis l'émetteur de MontRochard )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Laval - MontRochard ####
-#R1
-T 778166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R2
-T 610166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R3
-T 754166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R4
-T 794166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R5
-T 602166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R6
-T 802166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-LeCreusot b/util/scan/dvb-t/fr-LeCreusot
deleted file mode 100644
index ff4cb0b..0000000
--- a/util/scan/dvb-t/fr-LeCreusot
+++ /dev/null
@@ -1,25 +0,0 @@
-# Creusot(Le) - France (DVB-T transmitter of Creusot(Le) ( MontStVincent ) )
-# Creusot(Le) - France (signal DVB-T transmis depuis l'émetteur de MontStVincent )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Creusot(Le) - MontStVincent ####
-#R1
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 498000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 794000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 818000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 594000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-LeHavre b/util/scan/dvb-t/fr-LeHavre
deleted file mode 100644
index bf3bb0e..0000000
--- a/util/scan/dvb-t/fr-LeHavre
+++ /dev/null
@@ -1,25 +0,0 @@
-# Havre(Le) - France (DVB-T transmitter of Havre(Le) ( Harfleur ) )
-# Havre(Le) - France (signal DVB-T transmis depuis l'émetteur de Harfleur )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Havre(Le) - Harfleur ####
-#R1
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-LeMans b/util/scan/dvb-t/fr-LeMans
deleted file mode 100644
index 323018f..0000000
--- a/util/scan/dvb-t/fr-LeMans
+++ /dev/null
@@ -1,21 +0,0 @@
-# Le Mans - France (DVB-T transmitter of Mayet)
-# Le Mans - France (signal DVB-T transmis depuis l'émetteur de Mayet   )
-# Pour plus d'informations vous pouvez consulter :
-#  - le topic sur l'émetteur de Mayet sur le forum du site tvnt.net :
-#      http://www.tvnt.net/forum/viewtopic.php?t=48
-#  - le site de TDF : http://tnt.niv2.com/72100-LE-MANS.html
-# contact : Matthieu Duchemin <alkahan@free.fr>
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# R1 : Canal 26
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R2 : Canal 23
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R3 : Canal 56
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R4 : Canal 31
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R5 : Canal 37
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R6 : Canal 36
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-LePuyEnVelay b/util/scan/dvb-t/fr-LePuyEnVelay
deleted file mode 100644
index e1a95e9..0000000
--- a/util/scan/dvb-t/fr-LePuyEnVelay
+++ /dev/null
@@ -1,25 +0,0 @@
-# PuyenVelay(Le) - France (DVB-T transmitter of PuyenVelay(Le) ( Agglomération ) )
-# PuyenVelay(Le) - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### PuyenVelay(Le) - Agglomération ####
-#R1
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Lille b/util/scan/dvb-t/fr-Lille
deleted file mode 100644
index c30c520..0000000
--- a/util/scan/dvb-t/fr-Lille
+++ /dev/null
@@ -1,30 +0,0 @@
-# Lille - France (DVB-T transmitter of Lille ( Nondéfini ) )
-# Lille - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Lille - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Lille n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Lille-Lambersart b/util/scan/dvb-t/fr-Lille-Lambersart
deleted file mode 100644
index 6a7c377..0000000
--- a/util/scan/dvb-t/fr-Lille-Lambersart
+++ /dev/null
@@ -1,25 +0,0 @@
-# Lille - France (DVB-T transmitter of Lille ( Lambersart ) )
-# Lille - France (signal DVB-T transmis depuis l'émetteur de Lambersart )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Lille - Lambersart ####
-#R1
-T 594000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 570000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-LilleT2 b/util/scan/dvb-t/fr-LilleT2
deleted file mode 100644
index b629f70..0000000
--- a/util/scan/dvb-t/fr-LilleT2
+++ /dev/null
@@ -1,13 +0,0 @@
-# Lille - France (DVB-T transmitter of Lambersart)
-#offset of 167000 for Cinergy T2. Other type of card users need to replace 167 by 000
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#R2
-T 538167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R4
-T 546167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R3
-T 562167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R6
-T 586167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R1
-T 594167000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fr-Limoges b/util/scan/dvb-t/fr-Limoges
deleted file mode 100644
index 1581bcf..0000000
--- a/util/scan/dvb-t/fr-Limoges
+++ /dev/null
@@ -1,25 +0,0 @@
-# Limoges - France (DVB-T transmitter of Limoges ( Agglomération ) )
-# Limoges - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Limoges - Agglomération ####
-#R1
-T 826000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Longwy b/util/scan/dvb-t/fr-Longwy
deleted file mode 100644
index 9881bfc..0000000
--- a/util/scan/dvb-t/fr-Longwy
+++ /dev/null
@@ -1,30 +0,0 @@
-# Longwy - France (DVB-T transmitter of Longwy ( Nondéfini ) )
-# Longwy - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Longwy - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Longwy n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Lorient b/util/scan/dvb-t/fr-Lorient
deleted file mode 100644
index 0b3e307..0000000
--- a/util/scan/dvb-t/fr-Lorient
+++ /dev/null
@@ -1,25 +0,0 @@
-# Lorient - France (DVB-T transmitter of Lorient ( Ploemer ) )
-# Lorient - France (signal DVB-T transmis depuis l'émetteur de Ploemer )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Lorient - Ploemer ####
-#R1
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 818000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 570000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 794000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Lyon-Fourviere b/util/scan/dvb-t/fr-Lyon-Fourviere
deleted file mode 100644
index 8ee9145..0000000
--- a/util/scan/dvb-t/fr-Lyon-Fourviere
+++ /dev/null
@@ -1,18 +0,0 @@
-# Lyon - France (DVB-T transmitter of Fourvière)
-# Lyon - France (signal DVB-T transmis depuis l'émetteur de Fourvière)
-# see : http://tnt.niv2.com/69000-LYON.html
-# contact : Nicolas Estre <n_estre@yahoo.fr>
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# R1 : Canal 56
-T 754167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R2 : Canal 36
-T 594167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R3 : Canal 21
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R4 : Canal 54
-T 738167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R5 : Canal 27
-T 522167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R6 : Canal 24
-T 498167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Lyon-Pilat b/util/scan/dvb-t/fr-Lyon-Pilat
deleted file mode 100644
index 71cd3a5..0000000
--- a/util/scan/dvb-t/fr-Lyon-Pilat
+++ /dev/null
@@ -1,17 +0,0 @@
-# Lyon - France (DVB-T transmitter of Mt Pilat)
-# Lyon - France (signal DVB-T transmis depuis l'émetteur du Mont Pilat)
-# see : http://tnt.niv2.com/69000-LYON.html
-# contact : Nicolas Estre <n_estre@yahoo.fr>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# R1 : Canal 45
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R2 : Canal 36
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R3 : Canal 39
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R4 : Canal 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R5 : Canal 42
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# R6 : Canal 47
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Macon b/util/scan/dvb-t/fr-Macon
deleted file mode 100644
index dddebc5..0000000
--- a/util/scan/dvb-t/fr-Macon
+++ /dev/null
@@ -1,30 +0,0 @@
-# Mâcon - France (DVB-T transmitter of Mâcon ( Nondéfini ) )
-# Mâcon - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Mâcon - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Mâcon n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Mantes b/util/scan/dvb-t/fr-Mantes
deleted file mode 100644
index d9a1b7e..0000000
--- a/util/scan/dvb-t/fr-Mantes
+++ /dev/null
@@ -1,25 +0,0 @@
-# Mantes - France (DVB-T transmitter of Mantes ( MaudétourenVexin ) )
-# Mantes - France (signal DVB-T transmis depuis l'émetteur de MaudétourenVexin )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Mantes - MaudétourenVexin ####
-#R1
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 650000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 674000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 626000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Marseille b/util/scan/dvb-t/fr-Marseille
deleted file mode 100644
index 7a57003..0000000
--- a/util/scan/dvb-t/fr-Marseille
+++ /dev/null
@@ -1,6 +0,0 @@
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Maubeuge b/util/scan/dvb-t/fr-Maubeuge
deleted file mode 100644
index e865c02..0000000
--- a/util/scan/dvb-t/fr-Maubeuge
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maubeuge - France (DVB-T transmitter of Maubeuge ( Nondéfini ) )
-# Maubeuge - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Maubeuge - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Maubeuge n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Meaux b/util/scan/dvb-t/fr-Meaux
deleted file mode 100644
index 4837bf4..0000000
--- a/util/scan/dvb-t/fr-Meaux
+++ /dev/null
@@ -1,25 +0,0 @@
-# Meaux - France (DVB-T transmitter of Meaux ( Mareuil ) )
-# Meaux - France (signal DVB-T transmis depuis l'émetteur de Mareuil )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Meaux - Mareuil ####
-#R1
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 818000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Mende b/util/scan/dvb-t/fr-Mende
deleted file mode 100644
index 39bd41e..0000000
--- a/util/scan/dvb-t/fr-Mende
+++ /dev/null
@@ -1,25 +0,0 @@
-# Mende - France (DVB-T transmitter of Mende ( TrucdeFortunio ) )
-# Mende - France (signal DVB-T transmis depuis l'émetteur de TrucdeFortunio )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Mende - TrucdeFortunio ####
-#R1
-T 522000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 474000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 498000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Menton b/util/scan/dvb-t/fr-Menton
deleted file mode 100644
index f48fd72..0000000
--- a/util/scan/dvb-t/fr-Menton
+++ /dev/null
@@ -1,25 +0,0 @@
-# Menton - France (DVB-T transmitter of Menton ( CapMartin ) )
-# Menton - France (signal DVB-T transmis depuis l'émetteur de CapMartin )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Menton - CapMartin ####
-#R1
-T 682000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 842000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 658000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Metz b/util/scan/dvb-t/fr-Metz
deleted file mode 100644
index e018031..0000000
--- a/util/scan/dvb-t/fr-Metz
+++ /dev/null
@@ -1,30 +0,0 @@
-# Metz - France (DVB-T transmitter of Metz ( Nondéfini ) )
-# Metz - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Metz - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Metz n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Mezieres b/util/scan/dvb-t/fr-Mezieres
deleted file mode 100644
index 62dd087..0000000
--- a/util/scan/dvb-t/fr-Mezieres
+++ /dev/null
@@ -1,30 +0,0 @@
-# Mézières - France (DVB-T transmitter of Mézières ( Nondéfini ) )
-# Mézières - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Mézières - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Mézières n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Montbeliard b/util/scan/dvb-t/fr-Montbeliard
deleted file mode 100644
index 0bd9252..0000000
--- a/util/scan/dvb-t/fr-Montbeliard
+++ /dev/null
@@ -1,18 +0,0 @@
-# Montbéliard - France (DVB-T transmitter of Montbéliard "Fort Lachaux" )
-# Montbéliard - France (signal DVB-T transmis depuis l'émetteur de Fort Lachaux )
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# multiplex R1 (GR1), canal 29V + offset 167000 : FRANCE 2 SD , FRANCE 5 , ARTE SD , La Chaîne Parlementaire/Public Sénat , FRANCE 3 , FRANCE 3 Franche-Comté
-T 538167000 8MHz AUTO NONE QAM64 8k AUTO NONE
-# multiplex R3 (CNH), canal 43V + offset 167000 : CANAL+ , CANAL+HD , CANAL+ CINEMA , CANAL+ SPORT , PLANETE , CANAL J et TPS STAR
-T 650167000 8MHz AUTO NONE QAM64 8k AUTO NONE
-# multiplex R2 (NTN), canal 55V + offset 167000 : DIRECT 8 , BFM TV , I>TELE , FRANCE 4 , VIRGIN 17 , GULLI et France 4
-T 746167000 8MHz AUTO NONE QAM64 8k AUTO NONE
-# multiplex R6 (SMR6), canal 32V + offset 167000 : TF1 SD , NRJ 12 , TMC , EUROSPORT , LCI et TF6
-T 562167000 8MHz AUTO NONE QAM64 8k AUTO NONE
-# Télévision Suisse, canal 56V + offset 000000 : TSR1 , TSR2 , TSI1 et SF 1
-T 754000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-# multiplex R4 (MULTI4), canal 58V + offset 167000 : ARTE HD , PARIS PREMIERE, M6 SD , W9 , NT1
-T 770167000 8MHz AUTO NONE QAM64 8k AUTO NONE
-# multiplex R5 (???), canal ??? : TF1 HD , FRANCE 2 HD, M6 HD
-# canal d'émission pas encore défini (février 2009)
diff --git a/util/scan/dvb-t/fr-Montlucon b/util/scan/dvb-t/fr-Montlucon
deleted file mode 100644
index 64cd64a..0000000
--- a/util/scan/dvb-t/fr-Montlucon
+++ /dev/null
@@ -1,25 +0,0 @@
-# Montluçon - France (DVB-T transmitter of Montluçon ( Agglomération ) )
-# Montluçon - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Montluçon - Agglomération ####
-#R1
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 826000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Montpellier b/util/scan/dvb-t/fr-Montpellier
deleted file mode 100644
index c17bb8e..0000000
--- a/util/scan/dvb-t/fr-Montpellier
+++ /dev/null
@@ -1,25 +0,0 @@
-# Montpellier - France (DVB-T transmitter of Montpellier ( SaintBaudille ) )
-# Montpellier - France (signal DVB-T transmis depuis l'émetteur de SaintBaudille )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Montpellier - SaintBaudille ####
-#R1
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Mulhouse b/util/scan/dvb-t/fr-Mulhouse
deleted file mode 100644
index da420fd..0000000
--- a/util/scan/dvb-t/fr-Mulhouse
+++ /dev/null
@@ -1,26 +0,0 @@
-# Mulhouse - France (DVB-T transmitter of Mulhouse ( Belvédère ) )
-# Mulhouse - France (signal DVB-T transmis depuis l'émetteur du Belvédère )
-#
-# Fichier réalisé par :
-# IUT COLMAR DEPARTEMENT RESEAUX ET TELECOMMUNICATIONS
-# Novembre 2007
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# R1 - ch 53 : France 2, 3 (Alsace), 5, LCP et Arte (France)
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-
-# R2 - ch 55 : I-TELE, BFM TV, Direct 8, Gulli, Virgin 17 (ex-Europe 2 TV) et France 4
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-
-# R3 - ch 54 : TV payante : CANAL+, CANAL+ CINEMA, CANAL+ SPORT, PLANETE, CANAL J et TPS STAR
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-
-# R4 - ch 37 : M6, W9 et NT1 + TV payante : PARIS PREMIERE, TF6 et AB1
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-
-# R5
-# ch 66, candidat a la TVHD
-
-# R6 - ch 65 : TF 1, NRJ 12 et TMC + TV payante : Eurosport France et LCI
-T 826000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Nancy b/util/scan/dvb-t/fr-Nancy
deleted file mode 100644
index f4ff7b8..0000000
--- a/util/scan/dvb-t/fr-Nancy
+++ /dev/null
@@ -1,25 +0,0 @@
-# Nancy - France (DVB-T transmitter of Nancy ( Nondéfini ) )
-# Nancy - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Nancy - Nondéfini ####
-#R1
-T 522166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R2
-T 682166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R3
-T 794166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R4
-T 770166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R5
-T 498166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R6
-T 826166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Nantes b/util/scan/dvb-t/fr-Nantes
deleted file mode 100644
index 22d9e21..0000000
--- a/util/scan/dvb-t/fr-Nantes
+++ /dev/null
@@ -1,8 +0,0 @@
-# Nantes - France
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-NeufchatelEnBray b/util/scan/dvb-t/fr-NeufchatelEnBray
deleted file mode 100644
index 1eeb5ea..0000000
--- a/util/scan/dvb-t/fr-NeufchatelEnBray
+++ /dev/null
@@ -1,25 +0,0 @@
-# Neufchatel-en-Bray - France (DVB-T transmitter of Neufchatel-en-Bray ( Croixdalle ) )
-# Neufchatel-en-Bray - France (signal DVB-T transmis depuis l'émetteur de Croixdalle )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Neufchatel-en-Bray - Croixdalle ####
-#R1
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 522000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 498000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Nice b/util/scan/dvb-t/fr-Nice
deleted file mode 100644
index c122ab7..0000000
--- a/util/scan/dvb-t/fr-Nice
+++ /dev/null
@@ -1,25 +0,0 @@
-# Nice - France (DVB-T transmitter of Nice ( MontAlban ) )
-# Nice - France (signal DVB-T transmis depuis l'émetteur de MontAlban )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Nice - MontAlban ####
-#R1
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Niort b/util/scan/dvb-t/fr-Niort
deleted file mode 100644
index 396489a..0000000
--- a/util/scan/dvb-t/fr-Niort
+++ /dev/null
@@ -1,7 +0,0 @@
-# Niort - France (DVB-T transmitter of Niort-Maisonnay)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 602000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 738000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 778000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 802000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Orleans b/util/scan/dvb-t/fr-Orleans
deleted file mode 100644
index c42ccc5..0000000
--- a/util/scan/dvb-t/fr-Orleans
+++ /dev/null
@@ -1,17 +0,0 @@
-# Orléans / France
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# R2: canal 38 : direct8 TMC Gulli europe2 bfm itélé
-T 610166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# R1: canal 46 : F2 F3 F4 F5 arte LCP
-T 674166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# R4: canal 48 : M6 W9 NT1
-T 690166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# R6: canal 51 : TF1 NRJ12
-T 714166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# R3: canal 63 : canalplus
-T 810166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Paris b/util/scan/dvb-t/fr-Paris
deleted file mode 100644
index 61a7e8d..0000000
--- a/util/scan/dvb-t/fr-Paris
+++ /dev/null
@@ -1,19 +0,0 @@
-# Paris - France - various DVB-T transmitters
-# contributed by Alexis de Lattre <alexis@via.ecp.fr>
-# Paris - Tour Eiffel      : 21 24 27 29 32 35
-# Paris Est - Chennevières : 35 51 54 57 60 63
-# Paris Nord - Sannois     : 35 51 54 57 60 63
-# Paris Sud - Villebon     : 35 51 56 57 60 63
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 498166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 522166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 538166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 562166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 586166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 714166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 738166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 754166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 762166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 786166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 810166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Parthenay b/util/scan/dvb-t/fr-Parthenay
deleted file mode 100644
index 567ebe1..0000000
--- a/util/scan/dvb-t/fr-Parthenay
+++ /dev/null
@@ -1,25 +0,0 @@
-# Parthenay - France (DVB-T transmitter of Parthenay ( Amailloux ) )
-# Parthenay - France (signal DVB-T transmis depuis l'émetteur de Amailloux )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Parthenay - Amailloux ####
-#R1
-T 594000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Perpignan b/util/scan/dvb-t/fr-Perpignan
deleted file mode 100644
index d0b74ce..0000000
--- a/util/scan/dvb-t/fr-Perpignan
+++ /dev/null
@@ -1,25 +0,0 @@
-# Perpignan - France (DVB-T transmitter of Perpignan ( PicdeNeulos ) )
-# Perpignan - France (signal DVB-T transmis depuis l'émetteur de PicdeNeulos )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Perpignan - PicdeNeulos ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 474000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 498000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 522000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Poitiers b/util/scan/dvb-t/fr-Poitiers
deleted file mode 100644
index 2a0ed31..0000000
--- a/util/scan/dvb-t/fr-Poitiers
+++ /dev/null
@@ -1,25 +0,0 @@
-# Poitiers - France (DVB-T transmitter of Poitiers ( Agglomération ) )
-# Poitiers - France (signal DVB-T transmis depuis l'émetteur de Agglomération )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Poitiers - Agglomération ####
-#R1
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 754000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 794000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Privas b/util/scan/dvb-t/fr-Privas
deleted file mode 100644
index cd27631..0000000
--- a/util/scan/dvb-t/fr-Privas
+++ /dev/null
@@ -1,25 +0,0 @@
-# Privas - France (DVB-T transmitter of Privas ( Sud ) )
-# Privas - France (signal DVB-T transmis depuis l'émetteur de Sud )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Privas - Sud ####
-#R1
-T 658000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 570000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Reims b/util/scan/dvb-t/fr-Reims
deleted file mode 100644
index ab7c4e8..0000000
--- a/util/scan/dvb-t/fr-Reims
+++ /dev/null
@@ -1,25 +0,0 @@
-# Reims - France (DVB-T transmitter of Reims ( Hautvillers ) )
-# Reims - France (signal DVB-T transmis depuis l'émetteur de Hautvillers )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Reims - Hautvillers ####
-#R1
-T 562000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 554000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 666000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Rennes b/util/scan/dvb-t/fr-Rennes
deleted file mode 100644
index 3287413..0000000
--- a/util/scan/dvb-t/fr-Rennes
+++ /dev/null
@@ -1,7 +0,0 @@
-# Rennes - France
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 586000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 650000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 674000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 626000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Roanne b/util/scan/dvb-t/fr-Roanne
deleted file mode 100644
index 224ca9f..0000000
--- a/util/scan/dvb-t/fr-Roanne
+++ /dev/null
@@ -1,25 +0,0 @@
-# Roanne - France (DVB-T transmitter of Roanne ( Perreux ) )
-# Roanne - France (signal DVB-T transmis depuis l'émetteur de Perreux )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Roanne - Perreux ####
-#R1
-T 474000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 498000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 522000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Rochefort-sur-mer b/util/scan/dvb-t/fr-Rochefort-sur-mer
deleted file mode 100644
index c32bc0d..0000000
--- a/util/scan/dvb-t/fr-Rochefort-sur-mer
+++ /dev/null
@@ -1,14 +0,0 @@
-# TNT à Rochefort (17)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-#multiplex 6 ( TF1 LCI Eurosport TF6 NRJ12 TMC )
-T 498166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-#multiplex 4 ( M6 W9 NT1 Paris Première ARTE HD )
-T 738166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-#multiplex 1 ( France 2 France 3 France 5 ARTE LCP Chaîne locale ou France Ô )
-T 602166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-#multiplex 2 ( Direct 8 France 4 BFM TV Virgin 17 Gulli i>Télé  )
-T 778167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Rouen b/util/scan/dvb-t/fr-Rouen
deleted file mode 100644
index 5808155..0000000
--- a/util/scan/dvb-t/fr-Rouen
+++ /dev/null
@@ -1,8 +0,0 @@
-# Rouen - France
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-SaintEtienne b/util/scan/dvb-t/fr-SaintEtienne
deleted file mode 100644
index 740f223..0000000
--- a/util/scan/dvb-t/fr-SaintEtienne
+++ /dev/null
@@ -1,25 +0,0 @@
-# Saint-Etienne - France (DVB-T transmitter of Saint-Etienne ( CroixduGuisay ) )
-# Saint-Etienne - France (signal DVB-T transmis depuis l'émetteur de CroixduGuisay )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Saint-Etienne - CroixduGuisay ####
-#R1
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-SaintRaphael b/util/scan/dvb-t/fr-SaintRaphael
deleted file mode 100644
index da3a503..0000000
--- a/util/scan/dvb-t/fr-SaintRaphael
+++ /dev/null
@@ -1,25 +0,0 @@
-# Saint-Raphaël - France (DVB-T transmitter of Saint-Raphaël ( Picdel'Ours ) )
-# Saint-Raphaël - France (signal DVB-T transmis depuis l'émetteur de Picdel'Ours )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Saint-Raphaël - Picdel'Ours ####
-#R1
-T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 642000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Sannois b/util/scan/dvb-t/fr-Sannois
deleted file mode 100644
index c3e99e1..0000000
--- a/util/scan/dvb-t/fr-Sannois
+++ /dev/null
@@ -1,25 +0,0 @@
-# ParisNord - France (DVB-T transmitter of ParisNord ( Sannois ) )
-# ParisNord - France (signal DVB-T transmis depuis l'émetteur de Sannois )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### ParisNord - Sannois ####
-#R1
-T 586000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 786000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 762000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Sarrebourg b/util/scan/dvb-t/fr-Sarrebourg
deleted file mode 100644
index f6b8d57..0000000
--- a/util/scan/dvb-t/fr-Sarrebourg
+++ /dev/null
@@ -1,30 +0,0 @@
-# Sarrebourg - France (DVB-T transmitter of Sarrebourg ( Nondéfini ) )
-# Sarrebourg - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Sarrebourg - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Sarrebourg n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Sens b/util/scan/dvb-t/fr-Sens
deleted file mode 100644
index 3de1a26..0000000
--- a/util/scan/dvb-t/fr-Sens
+++ /dev/null
@@ -1,25 +0,0 @@
-# Sens - France (DVB-T transmitter of Sens ( GisylesNobles ) )
-# Sens - France (signal DVB-T transmis depuis l'émetteur de GisylesNobles )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Sens - GisylesNobles ####
-#R1
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 794000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 770000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Strasbourg b/util/scan/dvb-t/fr-Strasbourg
deleted file mode 100644
index 2c189de..0000000
--- a/util/scan/dvb-t/fr-Strasbourg
+++ /dev/null
@@ -1,18 +0,0 @@
-# Strasbourg - France (DVB-T transmitter of Strasbourg (Nordheim))
-# contributed by Benjamin Zores <ben@geexbox.org>
-#
-# Strasbourg - Nordheim: 22 47 48 51 61 69
-# See http://www.tvnt.net/V2/pages/342/medias/pro-bo-doc-tk-frequences_tnt.pdf
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Toulon b/util/scan/dvb-t/fr-Toulon
deleted file mode 100644
index 2fc9e9a..0000000
--- a/util/scan/dvb-t/fr-Toulon
+++ /dev/null
@@ -1,25 +0,0 @@
-# Toulon - France (DVB-T transmitter of Toulon ( CapSicié ) )
-# Toulon - France (signal DVB-T transmis depuis l'émetteur de CapSicié )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Toulon - CapSicié ####
-#R1
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 682000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 730000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Toulouse b/util/scan/dvb-t/fr-Toulouse
deleted file mode 100644
index 4c0ba20..0000000
--- a/util/scan/dvb-t/fr-Toulouse
+++ /dev/null
@@ -1,8 +0,0 @@
-# Toulouse - France (DVB-T transmitter of Bohnoure)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 698167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 722167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 714167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 746167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Toulouse-Midi b/util/scan/dvb-t/fr-Toulouse-Midi
deleted file mode 100644
index df51107..0000000
--- a/util/scan/dvb-t/fr-Toulouse-Midi
+++ /dev/null
@@ -1,25 +0,0 @@
-# Toulouse - France (DVB-T transmitter of Toulouse ( PicduMidi ) )
-# Toulouse - France (signal DVB-T transmis depuis l'émetteur de PicduMidi )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Toulouse - PicduMidi ####
-#R1
-T 738000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 482000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 594000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Tours b/util/scan/dvb-t/fr-Tours
deleted file mode 100644
index 9ad9f71..0000000
--- a/util/scan/dvb-t/fr-Tours
+++ /dev/null
@@ -1,25 +0,0 @@
-# Tours - France (DVB-T transmitter of Tours ( Chissay ) )
-# Tours - France (signal DVB-T transmis depuis l'émetteur de Chissay )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Tours - Chissay ####
-#R1
-T 578000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 810000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 690000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 714000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Troyes b/util/scan/dvb-t/fr-Troyes
deleted file mode 100644
index bcafe8b..0000000
--- a/util/scan/dvb-t/fr-Troyes
+++ /dev/null
@@ -1,25 +0,0 @@
-# Troyes - France (DVB-T transmitter of Troyes ( LesRiceys ) )
-# Troyes - France (signal DVB-T transmis depuis l'émetteur de LesRiceys )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Troyes - LesRiceys ####
-#R1
-T 482000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 594000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 506000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 530000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Ussel b/util/scan/dvb-t/fr-Ussel
deleted file mode 100644
index de2a58c..0000000
--- a/util/scan/dvb-t/fr-Ussel
+++ /dev/null
@@ -1,25 +0,0 @@
-# Ussel - France (DVB-T transmitter of Ussel ( Meymac ) )
-# Ussel - France (signal DVB-T transmis depuis l'émetteur de Meymac )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Ussel - Meymac ####
-#R1
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 634000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 658000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 682000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Valence b/util/scan/dvb-t/fr-Valence
deleted file mode 100644
index 4b74003..0000000
--- a/util/scan/dvb-t/fr-Valence
+++ /dev/null
@@ -1,25 +0,0 @@
-# Valence - France (DVB-T transmitter of Valence ( StRomaindeLerps ) )
-# Valence - France (signal DVB-T transmis depuis l'émetteur de StRomaindeLerps )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Valence - StRomaindeLerps ####
-#R1
-T 706000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-T 698000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-T 722000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-T 746000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-T 546000000 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-T 570000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Valenciennes b/util/scan/dvb-t/fr-Valenciennes
deleted file mode 100644
index 36d0642..0000000
--- a/util/scan/dvb-t/fr-Valenciennes
+++ /dev/null
@@ -1,30 +0,0 @@
-# Valenciennes - France (DVB-T transmitter of Valenciennes ( Nondéfini ) )
-# Valenciennes - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Valenciennes - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Valenciennes n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Vannes b/util/scan/dvb-t/fr-Vannes
deleted file mode 100644
index 06439cb..0000000
--- a/util/scan/dvb-t/fr-Vannes
+++ /dev/null
@@ -1,7 +0,0 @@
-# Vannes / France
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 698167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 762167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 778167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 818167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Villebon b/util/scan/dvb-t/fr-Villebon
deleted file mode 100644
index ec173d7..0000000
--- a/util/scan/dvb-t/fr-Villebon
+++ /dev/null
@@ -1,22 +0,0 @@
-# Paris - France (DVB-T transmitter of Villebon )
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# Villebon - France (DVB-T transmitter of Villebon (South of Paris))
-# Villebon - France (signal DVB-T transmis depuis l'émetteur de Villebon (Sud de Paris))
-# see : http://tnt.niv2.com/91140-VILLEBON-SUR-YVETTE.html
-# contact : Nicolas Estre <n_estre@yahoo.fr>
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### VILLEBON SUR YVETTE ####
-#R1 35
-T 586000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#R2 56
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R3 60
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R4 63
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R5 51
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#R6 57
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Vittel b/util/scan/dvb-t/fr-Vittel
deleted file mode 100644
index 8c55b23..0000000
--- a/util/scan/dvb-t/fr-Vittel
+++ /dev/null
@@ -1,30 +0,0 @@
-# Vittel - France (DVB-T transmitter of Vittel ( Nondéfini ) )
-# Vittel - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Vittel - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Vittel n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/fr-Voiron b/util/scan/dvb-t/fr-Voiron
deleted file mode 100644
index 04405c6..0000000
--- a/util/scan/dvb-t/fr-Voiron
+++ /dev/null
@@ -1,30 +0,0 @@
-# Voiron - France (DVB-T transmitter of Voiron ( Nondéfini ) )
-# Voiron - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
-#
-# ATTENTION ! Ce fichier a ete construit automatiquement a partir
-# des frequences obtenues sur : http://www.tvnt.net/multiplex_frequences.htm
-# en Avril 2006. Si vous constatez des problemes et voulez apporter des
-# modifications au fichier, envoyez le fichier modifie a
-# l'adresse linux-dvb@linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre@yahoo.fr>
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Voiron - Nondéfini ####
-#R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R5
-#T FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Voiron n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
diff --git a/util/scan/dvb-t/gr-Athens b/util/scan/dvb-t/gr-Athens
index 85cf6d7..f683333 100644
--- a/util/scan/dvb-t/gr-Athens
+++ b/util/scan/dvb-t/gr-Athens
@@ -1,3 +1,5 @@
 # Initial scan config for Digital DVB-T (Ert) in Athens Greece
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE     # Digea DVB-T
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE     # Digea DVB-T
 T 690000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hr-All b/util/scan/dvb-t/hr-All
index 9a7223c..6561858 100644
--- a/util/scan/dvb-t/hr-All
+++ b/util/scan/dvb-t/hr-All
@@ -1,24 +1,30 @@
 # Croatia, whole country
-# Created from http://www.hrt.hr/index.php?id=173&tx_ttnews[cat]=102&tx_ttnews[tt_news]=56725&tx_ttnews[backPid]=185&cHash=bdf5a53e91
-# and http://213.147.101.105/DVBT_MUXA_MUXB_Popis_odasiljackih_lokacija.html
-# and http://www.hrt.hr/index.php?id=173&tx_ttnews[cat]=102&tx_ttnews[tt_news]=7456&tx_ttnews[backPid]=185&cHash=d02ef00f9b
-# and http://www.oiv.hr/default.asp?ru=129&gl=200907100000002&sid=&jezik=0
+# Created from http://www.oiv.hr/broadcasting/tables/dtv_hr.aspx
+# and from http://www.oiv.hr/broadcasting/tables/dtv_channel_hr.aspx
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 474000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # D1 MUXD
+T 490000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXA
+T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D4 MUXA
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D5 MUXA, D9 MUXD
+T 538000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MUXD
+T 538000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # d72 MUXD
+T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D6 MUXA
+T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXD
+T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D8 MUXA
+T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D8 MUXD
+T 586000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # d71 MUXD
+T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D3 MUXD
+T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D1 MUXA
+T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXB
+T 642000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # D4 MUXD
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D1 MUXB, D3 MUXA, D6 MUXB
+T 666000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MUXD
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SLO MUXA
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D3 MUXB, D4 MUXB
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXA, D9 MUXA
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D5 MUXB, D8 MUXB
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D6 MUXD
+T 762000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE # Tusti Vrh MUXD
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXD
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXB, D9 MUXB
+T 850000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MFN
diff --git a/util/scan/dvb-t/hu-Bekescsaba b/util/scan/dvb-t/hu-Bekescsaba
new file mode 100644
index 0000000..e906111
--- /dev/null
+++ b/util/scan/dvb-t/hu-Bekescsaba
@@ -0,0 +1,17 @@
+# Hungary / Bekescsaba
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-54:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-65:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Budapest b/util/scan/dvb-t/hu-Budapest
index a697fda..09796a9 100644
--- a/util/scan/dvb-t/hu-Budapest
+++ b/util/scan/dvb-t/hu-Budapest
@@ -1,8 +1,17 @@
 # Hungary / Budapest
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-55:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+#
+# A.multiplex UHF-55:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
 T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
 # C.multiplex UHF-62:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
 T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Csavoly-Kiskoros b/util/scan/dvb-t/hu-Csavoly-Kiskoros
new file mode 100644
index 0000000..8091798
--- /dev/null
+++ b/util/scan/dvb-t/hu-Csavoly-Kiskoros
@@ -0,0 +1,17 @@
+# Hungary / Csavoly-Kiskoros
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-45:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-68:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Debrecen b/util/scan/dvb-t/hu-Debrecen
deleted file mode 100644
index 29898d3..0000000
--- a/util/scan/dvb-t/hu-Debrecen
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Debrecen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-46:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-62:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Gerecse b/util/scan/dvb-t/hu-Gerecse
new file mode 100644
index 0000000..ee8a0c4
--- /dev/null
+++ b/util/scan/dvb-t/hu-Gerecse
@@ -0,0 +1,17 @@
+# Hungary / Gerecse
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-64:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-63:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Gyor b/util/scan/dvb-t/hu-Gyor
deleted file mode 100644
index 9650df5..0000000
--- a/util/scan/dvb-t/hu-Gyor
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Gyor
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-42:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-61:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Gyor-Tatabanya b/util/scan/dvb-t/hu-Gyor-Tatabanya
new file mode 100644
index 0000000..3ed9bdf
--- /dev/null
+++ b/util/scan/dvb-t/hu-Gyor-Tatabanya
@@ -0,0 +1,17 @@
+# Hungary / Gyor-Tatabanya
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-42:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-61:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Kabhegy b/util/scan/dvb-t/hu-Kabhegy
deleted file mode 100644
index 7dfcecf..0000000
--- a/util/scan/dvb-t/hu-Kabhegy
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Kabhegy
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# C.multiplex UHF-61:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# A2.multiplex UHF-64:
-# MTV-1 HD Sopron, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Kabhegy-Mor-Siofok b/util/scan/dvb-t/hu-Kabhegy-Mor-Siofok
new file mode 100644
index 0000000..706a134
--- /dev/null
+++ b/util/scan/dvb-t/hu-Kabhegy-Mor-Siofok
@@ -0,0 +1,17 @@
+# Hungary / Kabhegy-Mor-Siofok
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-64:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-61:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Karcag b/util/scan/dvb-t/hu-Karcag
new file mode 100644
index 0000000..9c2b909
--- /dev/null
+++ b/util/scan/dvb-t/hu-Karcag
@@ -0,0 +1,17 @@
+# Hungary / Karcag
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-46:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-64:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Kekes b/util/scan/dvb-t/hu-Kekes
deleted file mode 100644
index 76807df..0000000
--- a/util/scan/dvb-t/hu-Kekes
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Kekes
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-44:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-69:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 858000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Kekes-Ozd b/util/scan/dvb-t/hu-Kekes-Ozd
new file mode 100644
index 0000000..a943652
--- /dev/null
+++ b/util/scan/dvb-t/hu-Kekes-Ozd
@@ -0,0 +1,17 @@
+# Hungary / Kekes-Ozd
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-44:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-69:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 858000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Kiskoros b/util/scan/dvb-t/hu-Kiskoros
index edf3d90..82cc97e 100644
--- a/util/scan/dvb-t/hu-Kiskoros
+++ b/util/scan/dvb-t/hu-Kiskoros
@@ -1,8 +1,17 @@
 # Hungary / Kiskoros
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-45:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+#
+# A.multiplex UHF-45:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
 T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
 # C.multiplex UHF-68:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
 T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Komadi-Debrecen b/util/scan/dvb-t/hu-Komadi-Debrecen
new file mode 100644
index 0000000..12f903e
--- /dev/null
+++ b/util/scan/dvb-t/hu-Komadi-Debrecen
@@ -0,0 +1,17 @@
+# Hungary / Debrecen-Komadi
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-46:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-62:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Nagykanizsa-Kaposvar b/util/scan/dvb-t/hu-Nagykanizsa-Kaposvar
new file mode 100644
index 0000000..7a7c24f
--- /dev/null
+++ b/util/scan/dvb-t/hu-Nagykanizsa-Kaposvar
@@ -0,0 +1,17 @@
+# Hungary / Kaposvar-Nagykanizsa
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-24:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 498000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-65:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Nagykanizsa-Ujudvar b/util/scan/dvb-t/hu-Nagykanizsa-Ujudvar
deleted file mode 100644
index 35f23d9..0000000
--- a/util/scan/dvb-t/hu-Nagykanizsa-Ujudvar
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Nagykanizsa / Ujudvar
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-24:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-65:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Pecs b/util/scan/dvb-t/hu-Pecs
deleted file mode 100644
index caf7643..0000000
--- a/util/scan/dvb-t/hu-Pecs
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Pecs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-52:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-67:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 842000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Pecs-Uzd b/util/scan/dvb-t/hu-Pecs-Uzd
new file mode 100644
index 0000000..188711b
--- /dev/null
+++ b/util/scan/dvb-t/hu-Pecs-Uzd
@@ -0,0 +1,17 @@
+# Hungary / Pecs-Uzd
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-52:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-67:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 842000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Salgotarjan b/util/scan/dvb-t/hu-Salgotarjan
new file mode 100644
index 0000000..dbd4870
--- /dev/null
+++ b/util/scan/dvb-t/hu-Salgotarjan
@@ -0,0 +1,17 @@
+# Hungary / Salgotarjan
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-55:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-62:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Sopron b/util/scan/dvb-t/hu-Sopron
new file mode 100644
index 0000000..07b1037
--- /dev/null
+++ b/util/scan/dvb-t/hu-Sopron
@@ -0,0 +1,17 @@
+# Hungary / Sopron
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-42:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-68:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Szeged b/util/scan/dvb-t/hu-Szeged
deleted file mode 100644
index 23f1c05..0000000
--- a/util/scan/dvb-t/hu-Szeged
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Szeged
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-60:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-65:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Szentes b/util/scan/dvb-t/hu-Szentes
deleted file mode 100644
index 41b9225..0000000
--- a/util/scan/dvb-t/hu-Szentes
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Szentes
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A3.multiplex UHF-60:
-# MTV-1 HD Szeged, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-65:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Szentes-Szeged b/util/scan/dvb-t/hu-Szentes-Szeged
new file mode 100644
index 0000000..864c1b9
--- /dev/null
+++ b/util/scan/dvb-t/hu-Szentes-Szeged
@@ -0,0 +1,17 @@
+# Hungary / Szentes-Szeged
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-60:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-65:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Tokaj b/util/scan/dvb-t/hu-Tokaj
deleted file mode 100644
index 6ef172a..0000000
--- a/util/scan/dvb-t/hu-Tokaj
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Tokaj
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-68:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-63:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Tokaj-Kazincbarcika b/util/scan/dvb-t/hu-Tokaj-Kazincbarcika
new file mode 100644
index 0000000..1435271
--- /dev/null
+++ b/util/scan/dvb-t/hu-Tokaj-Kazincbarcika
@@ -0,0 +1,17 @@
+# Hungary / Tokaj-Kazincbarcika
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-68:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-63:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Uzd b/util/scan/dvb-t/hu-Uzd
deleted file mode 100644
index c2d270e..0000000
--- a/util/scan/dvb-t/hu-Uzd
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Uzd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-52:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-67:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 842000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Vasvar b/util/scan/dvb-t/hu-Vasvar
new file mode 100644
index 0000000..a889d9c
--- /dev/null
+++ b/util/scan/dvb-t/hu-Vasvar
@@ -0,0 +1,17 @@
+# Hungary / Vasvar
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# A.multiplex UHF-58:
+# FREE --------------------------------------------------------------------------------
+# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
+# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
+# NON-FREE ----------------------------------------------------------------------------
+# ATV, HirTV
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+#
+# C.multiplex UHF-68:
+# FREE --------------------------------------------------------------------------------
+# DunaTV HD, Autonomia
+# NON-FREE ----------------------------------------------------------------------------
+# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
+T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Vasvar-Hegyhatsal b/util/scan/dvb-t/hu-Vasvar-Hegyhatsal
deleted file mode 100644
index 4190e4d..0000000
--- a/util/scan/dvb-t/hu-Vasvar-Hegyhatsal
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hungary / Vasvar / Hegyhatsal
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# A1.multiplex UHF-58:
-# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-# C.multiplex UHF-68:
-# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/il-All b/util/scan/dvb-t/il-All
new file mode 100644
index 0000000..3a74a6c
--- /dev/null
+++ b/util/scan/dvb-t/il-All
@@ -0,0 +1,5 @@
+# Israel, Israel Broadcasting Authority's transmitters
+# Generated from list in http://www.iba.org.il/reception/
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/ir-Tehran b/util/scan/dvb-t/ir-Tehran
new file mode 100644
index 0000000..d9ec5ad
--- /dev/null
+++ b/util/scan/dvb-t/ir-Tehran
@@ -0,0 +1,4 @@
+# DVB-T Tehran
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # IRIB-TV1/2/3/4/5, IRINN, AMOUZESH, QURAN-TV
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # PRESS TV, AL-ALAM, AL-KOUSAR, JAAMEJAM 1, IRIB MOSTANAD, IRIB OSTANI
diff --git a/util/scan/dvb-t/is-Reykjavik b/util/scan/dvb-t/is-Reykjavik
index da5e3c6..8d3f039 100644
--- a/util/scan/dvb-t/is-Reykjavik
+++ b/util/scan/dvb-t/is-Reykjavik
@@ -1,13 +1,29 @@
-# Initial scan config for Digital Ísland in Iceland
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20100316 1 0 OFDM IS </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: <add description here>
+# date (yyyy-mm-dd)    : 2010-10-22
+# provided by (opt)    : <your name or email here>
+#
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 522000000 8MHz  2/3 NONE    QAM64   8k 1/16 NONE
+T 530000000 8MHz  2/3 NONE    QAM64   8k 1/16 NONE # Vodafone
+T 538000000 8MHz  2/3 NONE    QAM64   8k 1/16 NONE
+T 674000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 770000000 8MHz  1/2 NONE    QAM64   2k 1/32 NONE # Vodafone
+T 690000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 722000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 738000000 8MHz  1/2 NONE     QPSK   2k 1/32 NONE # Vodafone
+T 754000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 762000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 778000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 818000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 714000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 682000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 698000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 706000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 794000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
+T 802000000 8MHz  2/3 NONE    QAM64   8k 1/32 NONE # Vodafone
diff --git a/util/scan/dvb-t/it-Milano b/util/scan/dvb-t/it-Milano
index 5854044..a0a5da2 100644
--- a/util/scan/dvb-t/it-Milano
+++ b/util/scan/dvb-t/it-Milano
@@ -1,15 +1,49 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX-A RAI
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 800000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
 T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-A MEDIASET
 T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-A MEDIASET-2
 T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MEDIASET LA 5 
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX La7/MTV
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE
 T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE 2
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX RETE A
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX STUDIO1
+T 184500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX STUDIO NORD
+T 191500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX VIDEO STAR NOVARA
+T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX TELENOVA
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX TELE 7 LAGHI 
+T 495250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX VIDEO BERGAMO
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX TELE MILANO
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# RETE 55
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# TELE LIBERTA'
+T 735250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# RSI
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# TELE COLOR PRIMARETE
+T 783250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# TELESTAR
+T 807250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# TELECAMPIONE
+T 847250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Modena b/util/scan/dvb-t/it-Modena
new file mode 100644
index 0000000..56dd106
--- /dev/null
+++ b/util/scan/dvb-t/it-Modena
@@ -0,0 +1,50 @@
+# DVB-T Collserola (Barcelona)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#Mux 1 Rai
+T 177500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux 2 Rai
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux 3 Rai
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux 4 Rai
+# T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Timb 1
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Timb 2
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Timb 3
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Mediaset 1
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Mediaset 2
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Mediaset 4
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Mediaset 5
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Mediaset 6
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Rete A 1
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux DFree
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Di. TV
+T 184500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux TV Rete 7
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Telestudio Modena
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Sesta Rete
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Trc Telemodena
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Canale Italia
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Telecentro Emilia Romagna
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Canale 24
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux VMT
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#Mux Nuovarete
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/nz-AucklandInfill b/util/scan/dvb-t/nz-AucklandInfill
new file mode 100644
index 0000000..08e572f
--- /dev/null
+++ b/util/scan/dvb-t/nz-AucklandInfill
@@ -0,0 +1,10 @@
+# Pinehill, Remuera, Sky Tower, Auckland Infill, Auckland NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 562000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 626000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-Waiatarua b/util/scan/dvb-t/nz-AucklandWaiatarua
index d6c7dac..83c1be8 100644
--- a/util/scan/dvb-t/nz-Waiatarua
+++ b/util/scan/dvb-t/nz-AucklandWaiatarua
@@ -1,13 +1,10 @@
 # Waiatarua, Auckland NZ
 #
 # Channel allocation details for NZ can be found at
-# http://www.rsm.govt.nz/cms/policy-and-planning/current-projects/broadcasting/digital-television-2007-frequency-plan
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
 #
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# Multiplex DA
 T 538000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Multiplex DB
 T 570000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Multiplex DC
 T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-Christchurch b/util/scan/dvb-t/nz-Christchurch
new file mode 100644
index 0000000..794a0b9
--- /dev/null
+++ b/util/scan/dvb-t/nz-Christchurch
@@ -0,0 +1,10 @@
+# Sugarloaf, Christchurch NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-Dunedin b/util/scan/dvb-t/nz-Dunedin
new file mode 100644
index 0000000..ad19937
--- /dev/null
+++ b/util/scan/dvb-t/nz-Dunedin
@@ -0,0 +1,10 @@
+# Mt Cargill, Dunedin NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-Hamilton b/util/scan/dvb-t/nz-Hamilton
new file mode 100644
index 0000000..6b44438
--- /dev/null
+++ b/util/scan/dvb-t/nz-Hamilton
@@ -0,0 +1,10 @@
+# Hamilton Infill, Waikato NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-HawkesBayMtErin b/util/scan/dvb-t/nz-HawkesBayMtErin
new file mode 100644
index 0000000..aece900
--- /dev/null
+++ b/util/scan/dvb-t/nz-HawkesBayMtErin
@@ -0,0 +1,10 @@
+# Mt. Erin, Hawkes Bay NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 522000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 554000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-HawkesBayNapier b/util/scan/dvb-t/nz-HawkesBayNapier
new file mode 100644
index 0000000..cebd667
--- /dev/null
+++ b/util/scan/dvb-t/nz-HawkesBayNapier
@@ -0,0 +1,10 @@
+# Napier Infill, Hawkes Bay NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-Manawatu b/util/scan/dvb-t/nz-Manawatu
new file mode 100644
index 0000000..eb64119
--- /dev/null
+++ b/util/scan/dvb-t/nz-Manawatu
@@ -0,0 +1,10 @@
+# Wharite, Manawatu NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-Tauranga b/util/scan/dvb-t/nz-Tauranga
new file mode 100644
index 0000000..3c3abce
--- /dev/null
+++ b/util/scan/dvb-t/nz-Tauranga
@@ -0,0 +1,10 @@
+# Kopukairua, Tauranga NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-Waikato b/util/scan/dvb-t/nz-Waikato
new file mode 100644
index 0000000..6dd7c81
--- /dev/null
+++ b/util/scan/dvb-t/nz-Waikato
@@ -0,0 +1,10 @@
+# Te Aroha, Waikato NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-WellingtonInfill b/util/scan/dvb-t/nz-WellingtonInfill
new file mode 100644
index 0000000..61042c4
--- /dev/null
+++ b/util/scan/dvb-t/nz-WellingtonInfill
@@ -0,0 +1,10 @@
+# Fitzherbert, Baxters Knob, Wellington infill, Wellington NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-WellingtonKaukau b/util/scan/dvb-t/nz-WellingtonKaukau
new file mode 100644
index 0000000..fa49dd6
--- /dev/null
+++ b/util/scan/dvb-t/nz-WellingtonKaukau
@@ -0,0 +1,10 @@
+# Kaukau, Wellington NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/nz-WellingtonNgarara b/util/scan/dvb-t/nz-WellingtonNgarara
new file mode 100644
index 0000000..4fb3469
--- /dev/null
+++ b/util/scan/dvb-t/nz-WellingtonNgarara
@@ -0,0 +1,10 @@
+# Ngarara, Wellington NZ
+#
+# Channel allocation details for NZ can be found at
+# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/pl-Warszawa b/util/scan/dvb-t/pl-Warszawa
index 64c0042..6ea4bb6 100644
--- a/util/scan/dvb-t/pl-Warszawa
+++ b/util/scan/dvb-t/pl-Warszawa
@@ -1,4 +1,10 @@
-# Warsaw / PKiN, Central Poland
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 746000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
+# location      : PL Warszawa mazowieckie
+# date scanned  : 2011-11-17
+#
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#T 538000000 8MHz AUTO AUTO     AUTO AUTO AUTO AUTO	# Polsat HD
+T 548000000 8MHz  2/3 NONE    QAM16   8k  1/4 NONE      # 
+T 690000000 8MHz  2/3 NONE    QAM16   8k  1/4 NONE      # MUX2 (dotych. naziemne bez TVP)
+T 730000000 8MHz  2/3 NONE    QAM16   8k  1/4 NONE	# TVN ND
+T 746000000 8MHz  3/4 NONE    QAM64   8k  1/8 NONE	# MUX3 (TVP)
+T 770000000 8MHz  3/4 NONE    QAM64   8k  1/8 NONE	# 
diff --git a/util/scan/dvb-t/se-Horby_Sallerup b/util/scan/dvb-t/se-Horby_Sallerup
index eac745a..ea54db9 100644
--- a/util/scan/dvb-t/se-Horby_Sallerup
+++ b/util/scan/dvb-t/se-Horby_Sallerup
@@ -2,6 +2,8 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
 T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
 T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
 T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
 T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/se-Molnbo_Tallstugan b/util/scan/dvb-t/se-Molnbo_Tallstugan
deleted file mode 100644
index 0ad2e03..0000000
--- a/util/scan/dvb-t/se-Molnbo_Tallstugan
+++ /dev/null
@@ -1,2 +0,0 @@
-# Sweden - Mölnbo/Tallstugan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
diff --git a/util/scan/dvb-t/si-Ljubljana b/util/scan/dvb-t/si-Ljubljana
new file mode 100644
index 0000000..3825669
--- /dev/null
+++ b/util/scan/dvb-t/si-Ljubljana
@@ -0,0 +1,5 @@
+# Slovenia / Ljubljana
+# MULTIPLEX A
+#------------------------------------------
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/sk-BanskaBystrica b/util/scan/dvb-t/sk-BanskaBystrica
index 80d73a2..1f8b0de 100644
--- a/util/scan/dvb-t/sk-BanskaBystrica
+++ b/util/scan/dvb-t/sk-BanskaBystrica
@@ -1,5 +1,9 @@
 # DVB-T Banska Bystrica (Banska Bystrica, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# on channel 65
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# 2.st multiplex (commercial) - on channel 51
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 33
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-BanskaStiavnica b/util/scan/dvb-t/sk-BanskaStiavnica
new file mode 100644
index 0000000..c70c048
--- /dev/null
+++ b/util/scan/dvb-t/sk-BanskaStiavnica
@@ -0,0 +1,9 @@
+# DVB-T Banska Stiavnica (Banska Stiavnica, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 21
+T 306000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 48
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Bardejov b/util/scan/dvb-t/sk-Bardejov
index 95daa9e..e8b6bf0 100644
--- a/util/scan/dvb-t/sk-Bardejov
+++ b/util/scan/dvb-t/sk-Bardejov
@@ -1,5 +1,9 @@
 # DVB-T Bardejov (Bardejov, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# on channel 62
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# 2.st multiplex (commercial) - on channel 40
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 54
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Bratislava b/util/scan/dvb-t/sk-Bratislava
index 57683a4..8d4fb83 100644
--- a/util/scan/dvb-t/sk-Bratislava
+++ b/util/scan/dvb-t/sk-Bratislava
@@ -1,5 +1,9 @@
 # DVB-T Bratislava (Bratislava, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# on channel 66
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# 2.st multiplex (commercial) - on channel 56
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 27
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Cadca b/util/scan/dvb-t/sk-Cadca
new file mode 100644
index 0000000..14481bb
--- /dev/null
+++ b/util/scan/dvb-t/sk-Cadca
@@ -0,0 +1,9 @@
+# DVB-T Cadca (Cadca, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 52
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 32
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Detva b/util/scan/dvb-t/sk-Detva
new file mode 100644
index 0000000..83824e7
--- /dev/null
+++ b/util/scan/dvb-t/sk-Detva
@@ -0,0 +1,9 @@
+# DVB-T Detva (Detva, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 60
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 33
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Hnusta b/util/scan/dvb-t/sk-Hnusta
new file mode 100644
index 0000000..b716e92
--- /dev/null
+++ b/util/scan/dvb-t/sk-Hnusta
@@ -0,0 +1,9 @@
+# DVB-T Hnusta (Hnusta, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 27
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 54
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Kosice b/util/scan/dvb-t/sk-Kosice
index 9046f28..b9a39c9 100644
--- a/util/scan/dvb-t/sk-Kosice
+++ b/util/scan/dvb-t/sk-Kosice
@@ -1,5 +1,9 @@
 # DVB-T Kosice (Kosice, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# on channel 64
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# 2.st multiplex (commercial) - on channel 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 25
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-KralovskyChlmec b/util/scan/dvb-t/sk-KralovskyChlmec
new file mode 100644
index 0000000..3a9b136
--- /dev/null
+++ b/util/scan/dvb-t/sk-KralovskyChlmec
@@ -0,0 +1,9 @@
+# DVB-T Kralovsky Chlmec (Kralovsky Chlmec, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 25
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Krompachy b/util/scan/dvb-t/sk-Krompachy
new file mode 100644
index 0000000..b36fb7a
--- /dev/null
+++ b/util/scan/dvb-t/sk-Krompachy
@@ -0,0 +1,9 @@
+# DVB-T Krompachy (Krompachy, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 25
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Lucenec b/util/scan/dvb-t/sk-Lucenec
new file mode 100644
index 0000000..e4d8f93
--- /dev/null
+++ b/util/scan/dvb-t/sk-Lucenec
@@ -0,0 +1,9 @@
+# DVB-T Lucenec (Lucenec, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 60
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 33
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Medzev b/util/scan/dvb-t/sk-Medzev
new file mode 100644
index 0000000..6d29a4b
--- /dev/null
+++ b/util/scan/dvb-t/sk-Medzev
@@ -0,0 +1,9 @@
+# DVB-T Medzev (Medzev, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 25
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Michalovce b/util/scan/dvb-t/sk-Michalovce
deleted file mode 100644
index f91b298..0000000
--- a/util/scan/dvb-t/sk-Michalovce
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Michalovce (Michalovce, Slovak Republic)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# on channel 64
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Namestovo b/util/scan/dvb-t/sk-Namestovo
index da916ee..94d10a3 100644
--- a/util/scan/dvb-t/sk-Namestovo
+++ b/util/scan/dvb-t/sk-Namestovo
@@ -1,5 +1,9 @@
 # DVB-T Namestovo (Namestovo, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# on channel 68
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# 2.st multiplex (commercial) - on channel 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 26
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Nitra b/util/scan/dvb-t/sk-Nitra
new file mode 100644
index 0000000..9a2290c
--- /dev/null
+++ b/util/scan/dvb-t/sk-Nitra
@@ -0,0 +1,9 @@
+# DVB-T Nitra (Nitra, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 21
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 48
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Poprad b/util/scan/dvb-t/sk-Poprad
index 74040ff..8096538 100644
--- a/util/scan/dvb-t/sk-Poprad
+++ b/util/scan/dvb-t/sk-Poprad
@@ -1,5 +1,10 @@
 # DVB-T Poprad (Poprad, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# on channel 66
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# 2.st multiplex (commercial) - on channel 55
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 24/54
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-PovazskaBystrica b/util/scan/dvb-t/sk-PovazskaBystrica
new file mode 100644
index 0000000..330120c
--- /dev/null
+++ b/util/scan/dvb-t/sk-PovazskaBystrica
@@ -0,0 +1,9 @@
+# DVB-T Povazska Bystrica (Povazska Bystrica, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 52
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 32
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Presov b/util/scan/dvb-t/sk-Presov
new file mode 100644
index 0000000..6516cea
--- /dev/null
+++ b/util/scan/dvb-t/sk-Presov
@@ -0,0 +1,9 @@
+# DVB-T Prešov (Prešov, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# MUX2 - Commercial - on channel 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# MUX3 - Public - on channel 25
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Prievidza b/util/scan/dvb-t/sk-Prievidza
new file mode 100644
index 0000000..2b6e25f
--- /dev/null
+++ b/util/scan/dvb-t/sk-Prievidza
@@ -0,0 +1,9 @@
+# DVB-T Prievidza (Prievidza, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 52
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 57
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Revuca b/util/scan/dvb-t/sk-Revuca
new file mode 100644
index 0000000..75f671b
--- /dev/null
+++ b/util/scan/dvb-t/sk-Revuca
@@ -0,0 +1,9 @@
+# DVB-T Revuca (Revuca, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 27
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 54
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-RimavskaSobota b/util/scan/dvb-t/sk-RimavskaSobota
deleted file mode 100644
index 6dfe7af..0000000
--- a/util/scan/dvb-t/sk-RimavskaSobota
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Rimavska Sobota (Rimavska Sobota, Slovak Republic)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# on channel 61
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Roznava b/util/scan/dvb-t/sk-Roznava
new file mode 100644
index 0000000..01ccc41
--- /dev/null
+++ b/util/scan/dvb-t/sk-Roznava
@@ -0,0 +1,9 @@
+# DVB-T Roznava (Roznava, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 27
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 54
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Ruzomberok b/util/scan/dvb-t/sk-Ruzomberok
new file mode 100644
index 0000000..bd7847e
--- /dev/null
+++ b/util/scan/dvb-t/sk-Ruzomberok
@@ -0,0 +1,9 @@
+# DVB-T Ruzomberok (Ruzomberok, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 26
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Snina b/util/scan/dvb-t/sk-Snina
new file mode 100644
index 0000000..52c1e2c
--- /dev/null
+++ b/util/scan/dvb-t/sk-Snina
@@ -0,0 +1,9 @@
+# DVB-T Snina (Snina, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 59
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 25
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-StaraLubovna b/util/scan/dvb-t/sk-StaraLubovna
new file mode 100644
index 0000000..4738b85
--- /dev/null
+++ b/util/scan/dvb-t/sk-StaraLubovna
@@ -0,0 +1,9 @@
+# DVB-T Stara Lubovna (Stara Lubovna, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 55
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 24
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Sturovo b/util/scan/dvb-t/sk-Sturovo
new file mode 100644
index 0000000..41b6486
--- /dev/null
+++ b/util/scan/dvb-t/sk-Sturovo
@@ -0,0 +1,9 @@
+# DVB-T Sturovo (Sturovo, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# 2.st multiplex (commercial) - on channel 21
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 48
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Trencin b/util/scan/dvb-t/sk-Trencin
index 9a0d7c1..743a99a 100644
--- a/util/scan/dvb-t/sk-Trencin
+++ b/util/scan/dvb-t/sk-Trencin
@@ -1,5 +1,9 @@
 # DVB-T Trencin (Trencin, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# on channel 69
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# 2.st multiplex (commercial) - on channel 52
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 57
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-VelkyKrtis b/util/scan/dvb-t/sk-VelkyKrtis
deleted file mode 100644
index 90d186a..0000000
--- a/util/scan/dvb-t/sk-VelkyKrtis
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Velky Krtis (Velky Krtis, Slovak Republic)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# on channel 65
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Zilina b/util/scan/dvb-t/sk-Zilina
index b1629b2..8e9ba16 100644
--- a/util/scan/dvb-t/sk-Zilina
+++ b/util/scan/dvb-t/sk-Zilina
@@ -1,5 +1,9 @@
 # DVB-T Zilina (Zilina, Slovak Republic)
+# Created from http://www.dvbt.towercom.sk/odbornici.php
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-# on channel 68
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# 2.st multiplex (commercial) - on channel 52
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+
+# 3.st multiplex (public) - on channel 32
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/uk-Aberdare b/util/scan/dvb-t/uk-Aberdare
index e38aad5..1676d8d 100644
--- a/util/scan/dvb-t/uk-Aberdare
+++ b/util/scan/dvb-t/uk-Aberdare
@@ -2,9 +2,14 @@
 # Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
 # and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 562167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 489833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+
+T 474167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 530167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+
+
+#C21+	C22+	C24-	C25+	C27-	C28+
+
diff --git a/util/scan/dvb-t/uk-Oxford b/util/scan/dvb-t/uk-Oxford
index 744a3d4..c179988 100644
--- a/util/scan/dvb-t/uk-Oxford
+++ b/util/scan/dvb-t/uk-Oxford
@@ -1,10 +1,26 @@
 # UK, Oxford
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+#
+# Post-Switchover, found from a mixture of w_scan, trial+error
+# and http://www.ukfree.tv/txdetail.php?a=SP567105
+
+# Local Channels, C51, details still TBA
 T 713833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 721833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+
+# PSB1 BBC-A, C53+. Apparently 730.2 but actually looks to be 730.167
+T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+# ArqB (COM6), C55, 746.0
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+# PSB3 BBC-B, C57, 256QAM DVB-T2, TBA
+# May well be wrong, needs a DVB-T2 tuner to be sure!
+T 762000000 8MHz 2/3 NONE QAM256 8k 1/32 NONE
+
+# ArqA (COM5), C59-, Apparently 777.8 but actually looks to be 777.833
+T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+# PSB2, D3+4, C60-, Apparently 785.0 but actually looks to be 785.833
+T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+# SDN (COM4), C62, 802.0
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/scan.c b/util/scan/scan.c
index 3058bdb..972d529 100644
--- a/util/scan/scan.c
+++ b/util/scan/scan.c
@@ -33,6 +33,8 @@
 #include <assert.h>
 #include <glob.h>
 #include <ctype.h>
+#include <iconv.h>
+#include <langinfo.h>
 
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
@@ -67,6 +69,10 @@ static int vdr_version = 3;
 static struct lnb_types_st lnb_type;
 static int unique_anon_services;
 
+char *default_charset = "ISO-6937";
+char *output_charset;
+#define CS_OPTIONS "//TRANSLIT"
+
 static enum fe_spectral_inversion spectral_inversion = INVERSION_AUTO;
 
 enum table_type {
@@ -543,60 +549,445 @@ static void parse_frequency_list_descriptor (const unsigned char *buf,
 	}
 }
 
+/*
+ * handle character set correctly (e.g. via iconv)
+ *   c.f. EN 300 468 annex A
+ */
+
+struct charset_conv {
+	unsigned len;
+	unsigned char  data[3];
+};
+
+/* This table is the Latin 00 table. Basically ISO-6937 + Euro sign */
+struct charset_conv en300468_latin_00_to_utf8[256] = {
+	[0x00] = { 1, {0x00, } },
+	[0x01] = { 1, {0x01, } },
+	[0x02] = { 1, {0x02, } },
+	[0x03] = { 1, {0x03, } },
+	[0x04] = { 1, {0x04, } },
+	[0x05] = { 1, {0x05, } },
+	[0x06] = { 1, {0x06, } },
+	[0x07] = { 1, {0x07, } },
+	[0x08] = { 1, {0x08, } },
+	[0x09] = { 1, {0x09, } },
+	[0x0a] = { 1, {0x0a, } },
+	[0x0b] = { 1, {0x0b, } },
+	[0x0c] = { 1, {0x0c, } },
+	[0x0d] = { 1, {0x0d, } },
+	[0x0e] = { 1, {0x0e, } },
+	[0x0f] = { 1, {0x0f, } },
+	[0x10] = { 1, {0x10, } },
+	[0x11] = { 1, {0x11, } },
+	[0x12] = { 1, {0x12, } },
+	[0x13] = { 1, {0x13, } },
+	[0x14] = { 1, {0x14, } },
+	[0x15] = { 1, {0x15, } },
+	[0x16] = { 1, {0x16, } },
+	[0x17] = { 1, {0x17, } },
+	[0x18] = { 1, {0x18, } },
+	[0x19] = { 1, {0x19, } },
+	[0x1a] = { 1, {0x1a, } },
+	[0x1b] = { 1, {0x1b, } },
+	[0x1c] = { 1, {0x1c, } },
+	[0x1d] = { 1, {0x1d, } },
+	[0x1e] = { 1, {0x1e, } },
+	[0x1f] = { 1, {0x1f, } },
+	[0x20] = { 1, {0x20, } },
+	[0x21] = { 1, {0x21, } },
+	[0x22] = { 1, {0x22, } },
+	[0x23] = { 1, {0x23, } },
+	[0x24] = { 1, {0x24, } },
+	[0x25] = { 1, {0x25, } },
+	[0x26] = { 1, {0x26, } },
+	[0x27] = { 1, {0x27, } },
+	[0x28] = { 1, {0x28, } },
+	[0x29] = { 1, {0x29, } },
+	[0x2a] = { 1, {0x2a, } },
+	[0x2b] = { 1, {0x2b, } },
+	[0x2c] = { 1, {0x2c, } },
+	[0x2d] = { 1, {0x2d, } },
+	[0x2e] = { 1, {0x2e, } },
+	[0x2f] = { 1, {0x2f, } },
+	[0x30] = { 1, {0x30, } },
+	[0x31] = { 1, {0x31, } },
+	[0x32] = { 1, {0x32, } },
+	[0x33] = { 1, {0x33, } },
+	[0x34] = { 1, {0x34, } },
+	[0x35] = { 1, {0x35, } },
+	[0x36] = { 1, {0x36, } },
+	[0x37] = { 1, {0x37, } },
+	[0x38] = { 1, {0x38, } },
+	[0x39] = { 1, {0x39, } },
+	[0x3a] = { 1, {0x3a, } },
+	[0x3b] = { 1, {0x3b, } },
+	[0x3c] = { 1, {0x3c, } },
+	[0x3d] = { 1, {0x3d, } },
+	[0x3e] = { 1, {0x3e, } },
+	[0x3f] = { 1, {0x3f, } },
+	[0x40] = { 1, {0x40, } },
+	[0x41] = { 1, {0x41, } },
+	[0x42] = { 1, {0x42, } },
+	[0x43] = { 1, {0x43, } },
+	[0x44] = { 1, {0x44, } },
+	[0x45] = { 1, {0x45, } },
+	[0x46] = { 1, {0x46, } },
+	[0x47] = { 1, {0x47, } },
+	[0x48] = { 1, {0x48, } },
+	[0x49] = { 1, {0x49, } },
+	[0x4a] = { 1, {0x4a, } },
+	[0x4b] = { 1, {0x4b, } },
+	[0x4c] = { 1, {0x4c, } },
+	[0x4d] = { 1, {0x4d, } },
+	[0x4e] = { 1, {0x4e, } },
+	[0x4f] = { 1, {0x4f, } },
+	[0x50] = { 1, {0x50, } },
+	[0x51] = { 1, {0x51, } },
+	[0x52] = { 1, {0x52, } },
+	[0x53] = { 1, {0x53, } },
+	[0x54] = { 1, {0x54, } },
+	[0x55] = { 1, {0x55, } },
+	[0x56] = { 1, {0x56, } },
+	[0x57] = { 1, {0x57, } },
+	[0x58] = { 1, {0x58, } },
+	[0x59] = { 1, {0x59, } },
+	[0x5a] = { 1, {0x5a, } },
+	[0x5b] = { 1, {0x5b, } },
+	[0x5c] = { 1, {0x5c, } },
+	[0x5d] = { 1, {0x5d, } },
+	[0x5e] = { 1, {0x5e, } },
+	[0x5f] = { 1, {0x5f, } },
+	[0x60] = { 1, {0x60, } },
+	[0x61] = { 1, {0x61, } },
+	[0x62] = { 1, {0x62, } },
+	[0x63] = { 1, {0x63, } },
+	[0x64] = { 1, {0x64, } },
+	[0x65] = { 1, {0x65, } },
+	[0x66] = { 1, {0x66, } },
+	[0x67] = { 1, {0x67, } },
+	[0x68] = { 1, {0x68, } },
+	[0x69] = { 1, {0x69, } },
+	[0x6a] = { 1, {0x6a, } },
+	[0x6b] = { 1, {0x6b, } },
+	[0x6c] = { 1, {0x6c, } },
+	[0x6d] = { 1, {0x6d, } },
+	[0x6e] = { 1, {0x6e, } },
+	[0x6f] = { 1, {0x6f, } },
+	[0x70] = { 1, {0x70, } },
+	[0x71] = { 1, {0x71, } },
+	[0x72] = { 1, {0x72, } },
+	[0x73] = { 1, {0x73, } },
+	[0x74] = { 1, {0x74, } },
+	[0x75] = { 1, {0x75, } },
+	[0x76] = { 1, {0x76, } },
+	[0x77] = { 1, {0x77, } },
+	[0x78] = { 1, {0x78, } },
+	[0x79] = { 1, {0x79, } },
+	[0x7a] = { 1, {0x7a, } },
+	[0x7b] = { 1, {0x7b, } },
+	[0x7c] = { 1, {0x7c, } },
+	[0x7d] = { 1, {0x7d, } },
+	[0x7e] = { 1, {0x7e, } },
+	[0x7f] = { 1, {0x7f, } },
+	[0x80] = { 2, {0xc2, 0x80, } },
+	[0x81] = { 2, {0xc2, 0x81, } },
+	[0x82] = { 2, {0xc2, 0x82, } },
+	[0x83] = { 2, {0xc2, 0x83, } },
+	[0x84] = { 2, {0xc2, 0x84, } },
+	[0x85] = { 2, {0xc2, 0x85, } },
+	[0x86] = { 2, {0xc2, 0x86, } },
+	[0x87] = { 2, {0xc2, 0x87, } },
+	[0x88] = { 2, {0xc2, 0x88, } },
+	[0x89] = { 2, {0xc2, 0x89, } },
+	[0x8a] = { 2, {0xc2, 0x8a, } },
+	[0x8b] = { 2, {0xc2, 0x8b, } },
+	[0x8c] = { 2, {0xc2, 0x8c, } },
+	[0x8d] = { 2, {0xc2, 0x8d, } },
+	[0x8e] = { 2, {0xc2, 0x8e, } },
+	[0x8f] = { 2, {0xc2, 0x8f, } },
+	[0x90] = { 2, {0xc2, 0x90, } },
+	[0x91] = { 2, {0xc2, 0x91, } },
+	[0x92] = { 2, {0xc2, 0x92, } },
+	[0x93] = { 2, {0xc2, 0x93, } },
+	[0x94] = { 2, {0xc2, 0x94, } },
+	[0x95] = { 2, {0xc2, 0x95, } },
+	[0x96] = { 2, {0xc2, 0x96, } },
+	[0x97] = { 2, {0xc2, 0x97, } },
+	[0x98] = { 2, {0xc2, 0x98, } },
+	[0x99] = { 2, {0xc2, 0x99, } },
+	[0x9a] = { 2, {0xc2, 0x9a, } },
+	[0x9b] = { 2, {0xc2, 0x9b, } },
+	[0x9c] = { 2, {0xc2, 0x9c, } },
+	[0x9d] = { 2, {0xc2, 0x9d, } },
+	[0x9e] = { 2, {0xc2, 0x9e, } },
+	[0x9f] = { 2, {0xc2, 0x9f, } },
+	[0xa0] = { 2, {0xc2, 0xa0, } },
+	[0xa1] = { 2, {0xc2, 0xa1, } },
+	[0xa2] = { 2, {0xc2, 0xa2, } },
+	[0xa3] = { 2, {0xc2, 0xa3, } },
+	[0xa4] = { 3, { 0xe2, 0x82, 0xac,} },		/* Euro sign. Addition over the ISO-6937 standard */
+	[0xa5] = { 2, {0xc2, 0xa5, } },
+	[0xa6] = { 0, {} },
+	[0xa7] = { 2, {0xc2, 0xa7, } },
+	[0xa8] = { 2, {0xc2, 0xa4, } },
+	[0xa9] = { 3, {0xe2, 0x80, 0x98, } },
+	[0xaa] = { 3, {0xe2, 0x80, 0x9c, } },
+	[0xab] = { 2, {0xc2, 0xab, } },
+	[0xac] = { 3, {0xe2, 0x86, 0x90, } },
+	[0xad] = { 3, {0xe2, 0x86, 0x91, } },
+	[0xae] = { 3, {0xe2, 0x86, 0x92, } },
+	[0xaf] = { 3, {0xe2, 0x86, 0x93, } },
+	[0xb0] = { 2, {0xc2, 0xb0, } },
+	[0xb1] = { 2, {0xc2, 0xb1, } },
+	[0xb2] = { 2, {0xc2, 0xb2, } },
+	[0xb3] = { 2, {0xc2, 0xb3, } },
+	[0xb4] = { 2, {0xc3, 0x97, } },
+	[0xb5] = { 2, {0xc2, 0xb5, } },
+	[0xb6] = { 2, {0xc2, 0xb6, } },
+	[0xb7] = { 2, {0xc2, 0xb7, } },
+	[0xb8] = { 2, {0xc3, 0xb7, } },
+	[0xb9] = { 3, {0xe2, 0x80, 0x99, } },
+	[0xba] = { 3, {0xe2, 0x80, 0x9d, } },
+	[0xbb] = { 2, {0xc2, 0xbb, } },
+	[0xbc] = { 2, {0xc2, 0xbc, } },
+	[0xbd] = { 2, {0xc2, 0xbd, } },
+	[0xbe] = { 2, {0xc2, 0xbe, } },
+	[0xbf] = { 2, {0xc2, 0xbf, } },
+	[0xc0] = { 0, {} },
+	[0xc1] = { 0, {} },
+	[0xc2] = { 0, {} },
+	[0xc3] = { 0, {} },
+	[0xc4] = { 0, {} },
+	[0xc5] = { 0, {} },
+	[0xc6] = { 0, {} },
+	[0xc7] = { 0, {} },
+	[0xc8] = { 0, {} },
+	[0xc9] = { 0, {} },
+	[0xca] = { 0, {} },
+	[0xcb] = { 0, {} },
+	[0xcc] = { 0, {} },
+	[0xcd] = { 0, {} },
+	[0xce] = { 0, {} },
+	[0xcf] = { 0, {} },
+	[0xd0] = { 3, {0xe2, 0x80, 0x94, } },
+	[0xd1] = { 2, {0xc2, 0xb9, } },
+	[0xd2] = { 2, {0xc2, 0xae, } },
+	[0xd3] = { 2, {0xc2, 0xa9, } },
+	[0xd4] = { 3, {0xe2, 0x84, 0xa2, } },
+	[0xd5] = { 3, {0xe2, 0x99, 0xaa, } },
+	[0xd6] = { 2, {0xc2, 0xac, } },
+	[0xd7] = { 2, {0xc2, 0xa6, } },
+	[0xd8] = { 0, {} },
+	[0xd9] = { 0, {} },
+	[0xda] = { 0, {} },
+	[0xdb] = { 0, {} },
+	[0xdc] = { 3, {0xe2, 0x85, 0x9b, } },
+	[0xdd] = { 3, {0xe2, 0x85, 0x9c, } },
+	[0xde] = { 3, {0xe2, 0x85, 0x9d, } },
+	[0xdf] = { 3, {0xe2, 0x85, 0x9e, } },
+	[0xe0] = { 3, {0xe2, 0x84, 0xa6, } },
+	[0xe1] = { 2, {0xc3, 0x86, } },
+	[0xe2] = { 2, {0xc3, 0x90, } },
+	[0xe3] = { 2, {0xc2, 0xaa, } },
+	[0xe4] = { 2, {0xc4, 0xa6, } },
+	[0xe5] = { 0, {} },
+	[0xe6] = { 2, {0xc4, 0xb2, } },
+	[0xe7] = { 2, {0xc4, 0xbf, } },
+	[0xe8] = { 2, {0xc5, 0x81, } },
+	[0xe9] = { 2, {0xc3, 0x98, } },
+	[0xea] = { 2, {0xc5, 0x92, } },
+	[0xeb] = { 2, {0xc2, 0xba, } },
+	[0xec] = { 2, {0xc3, 0x9e, } },
+	[0xed] = { 2, {0xc5, 0xa6, } },
+	[0xee] = { 2, {0xc5, 0x8a, } },
+	[0xef] = { 2, {0xc5, 0x89, } },
+	[0xf0] = { 2, {0xc4, 0xb8, } },
+	[0xf1] = { 2, {0xc3, 0xa6, } },
+	[0xf2] = { 2, {0xc4, 0x91, } },
+	[0xf3] = { 2, {0xc3, 0xb0, } },
+	[0xf4] = { 2, {0xc4, 0xa7, } },
+	[0xf5] = { 2, {0xc4, 0xb1, } },
+	[0xf6] = { 2, {0xc4, 0xb3, } },
+	[0xf7] = { 2, {0xc5, 0x80, } },
+	[0xf8] = { 2, {0xc5, 0x82, } },
+	[0xf9] = { 2, {0xc3, 0xb8, } },
+	[0xfa] = { 2, {0xc5, 0x93, } },
+	[0xfb] = { 2, {0xc3, 0x9f, } },
+	[0xfc] = { 2, {0xc3, 0xbe, } },
+	[0xfd] = { 2, {0xc5, 0xa7, } },
+	[0xfe] = { 2, {0xc5, 0x8b, } },
+	[0xff] = { 2, {0xc2, 0xad, } },
+};
+
+static void descriptorcpy(char **dest, const unsigned char *src, size_t len)
+{
+	size_t destlen, i;
+	char *p, *type = default_charset;
+	unsigned char *tmp = NULL;
+	const unsigned char *s;
+	int emphasis = 0, need_conversion = 1;
+
+	if (*dest) {
+		free (*dest);
+		*dest = NULL;
+	}
+	if (!len)
+		return;
+
+	if (*src < 0x20) {
+		switch (*src) {
+		case 0x00:	type = "ISO-6937";		break;
+		case 0x01:	type = "ISO-8859-5";		break;
+		case 0x02:	type = "ISO-8859-6";		break;
+		case 0x03:	type = "ISO-8859-7";		break;
+		case 0x04:	type = "ISO-8859-8";		break;
+		case 0x05:	type = "ISO-8859-9";		break;
+		case 0x06:	type = "ISO-8859-10";		break;
+		case 0x07:	type = "ISO-8859-11";		break;
+		case 0x09:	type = "ISO-8859-13";		break;
+		case 0x0a:	type = "ISO-8859-14";		break;
+		case 0x0b:	type = "ISO-8859-15";		break;
+		case 0x11:	type = "ISO-10646";		break;
+		case 0x12:	type = "ISO-2022-KR";		break;
+		case 0x13:	type = "GB2312";		break;
+		case 0x14:	type = "BIG5";			break;
+		case 0x15:	type = "ISO-10646/UTF-8";	break;
+		case 0x10: /* ISO8859 */
+			if ((*(src + 1) != 0) || *(src + 2) > 0x0f)
+				break;
+			src+=2;
+			len-=2;
+			switch(*src) {
+			case 0x01:	type = "ISO-8859-1";		break;
+			case 0x02:	type = "ISO-8859-2";		break;
+			case 0x03:	type = "ISO-8859-3";		break;
+			case 0x04:	type = "ISO-8859-4";		break;
+			case 0x05:	type = "ISO-8859-5";		break;
+			case 0x06:	type = "ISO-8859-6";		break;
+			case 0x07:	type = "ISO-8859-7";		break;
+			case 0x08:	type = "ISO-8859-8";		break;
+			case 0x09:	type = "ISO-8859-9";		break;
+			case 0x0a:	type = "ISO-8859-10";		break;
+			case 0x0b:	type = "ISO-8859-11";		break;
+			case 0x0d:	type = "ISO-8859-13";		break;
+			case 0x0e:	type = "ISO-8859-14";		break;
+			case 0x0f:	type = "ISO-8859-15";		break;
+			}
+		}
+		src++;
+		len--;
+	}
+
+	/*
+	 * Destination length should be bigger. As the worse case seems to
+	 * use 3 chars for one code, use it for destlen
+	 */
+	destlen = len * 3;
+	*dest = malloc(destlen + 1);
+
+	/* Remove special chars */
+	if (!strncasecmp(type, "ISO-8859", 8) || !strcasecmp(type, "ISO-6937")) {
+		/*
+		 * Handles the ISO/IEC 10646 1-byte control codes
+		 * (EN 300 468 v1.11.1 Table A.1)
+		 * Emphasis will be represented as: *emphased*
+		 */
+		tmp = malloc(len + 2);
+		p = (char *)tmp;
+		s = src;
+		for (i = 0; i < len; i++, s++) {
+			if (*s >= 0x20 && (*s < 0x80 || *s > 0x9f))
+				*p++ = *s;
+			else if (*s == 0x86) {
+				*p++ = '*';
+				emphasis = 1;
+			} else if (*s == 0x87 && emphasis) {
+				*p++ = '*';
+				emphasis = 0;
+			}
+		}
+		if (emphasis)
+			*p++ = '*';
+		*p = '\0';
+	} else {
+		/*
+		 * FIXME: need to handle the ISO/IEC 10646 2-byte control codes
+		 * (EN 300 468 v1.11.1 Table A.2)
+		 */
+	}
+
+	if (tmp)
+		s = tmp;
+	else
+		s = src;
+
+	p = *dest;
+	if (!strcasecmp(type, "ISO-6937")) {
+		unsigned char *p1, *p2;
+
+		/* Convert charset to UTF-8 using Code table 00 - Latin */
+		for (p1 = (unsigned char *)s; p1 < s + len; p1++)
+			for (p2 = en300468_latin_00_to_utf8[*p1].data;
+			     p2 < en300468_latin_00_to_utf8[*p1].data + en300468_latin_00_to_utf8[*p1].len;
+			     p2++)
+				*p++ = *p2;
+		*p = '\0';
+
+		/* If desired charset is not UTF-8, prepare for conversion */
+		if (strcasecmp(output_charset, "UTF-8")) {
+			if (tmp)
+				free(tmp);
+			tmp = (unsigned char *)*dest;
+			len = p - *dest;
+
+			*dest = malloc(destlen + 1);
+			type = "UTF-8";
+			s = tmp;
+		} else
+			need_conversion = 0;
+
+	}
+
+	/* Convert from original charset to the desired one */
+	if (need_conversion) {
+		char out_cs[strlen(output_charset) + 1 + sizeof(CS_OPTIONS)];
+
+		p = *dest;
+		strcpy(out_cs, output_charset);
+		strcat(out_cs, CS_OPTIONS);
+
+		iconv_t cd = iconv_open(out_cs, type);
+		if (cd == (iconv_t)(-1)) {
+			memcpy(p, s, len);
+			p[len] = '\0';
+			warning("Conversion from %s to %s not supported\n",
+				 type, output_charset);
+		} else {
+			iconv(cd, (char **)&s, &len, &p, &destlen);
+			iconv_close(cd);
+			*p = '\0';
+		}
+	}
+
+	if (tmp)
+		free(tmp);
+}
+
 static void parse_service_descriptor (const unsigned char *buf, struct service *s)
 {
 	unsigned char len;
-	unsigned char *src, *dest;
 
 	s->type = buf[2];
 
 	buf += 3;
 	len = *buf;
 	buf++;
-
-	if (s->provider_name)
-		free (s->provider_name);
-
-	s->provider_name = malloc (len + 1);
-	memcpy (s->provider_name, buf, len);
-	s->provider_name[len] = '\0';
-
-	/* remove control characters (FIXME: handle short/long name) */
-	/* FIXME: handle character set correctly (e.g. via iconv)
-	 * c.f. EN 300 468 annex A */
-	for (src = dest = (unsigned char *) s->provider_name; *src; src++)
-		if (*src >= 0x20 && (*src < 0x80 || *src > 0x9f))
-			*dest++ = *src;
-	*dest = '\0';
-	if (!s->provider_name[0]) {
-		/* zap zero length names */
-		free (s->provider_name);
-		s->provider_name = 0;
-	}
-
-	if (s->service_name)
-		free (s->service_name);
+	descriptorcpy(&s->provider_name, buf, len);
 
 	buf += len;
 	len = *buf;
 	buf++;
-
-	s->service_name = malloc (len + 1);
-	memcpy (s->service_name, buf, len);
-	s->service_name[len] = '\0';
-
-	/* remove control characters (FIXME: handle short/long name) */
-	/* FIXME: handle character set correctly (e.g. via iconv)
-	 * c.f. EN 300 468 annex A */
-	for (src = dest = (unsigned char *) s->service_name; *src; src++)
-		if (*src >= 0x20 && (*src < 0x80 || *src > 0x9f))
-			*dest++ = *src;
-	*dest = '\0';
-	if (!s->service_name[0]) {
-		/* zap zero length names */
-		free (s->service_name);
-		s->service_name = 0;
-	}
+	descriptorcpy(&s->service_name, buf, len);
 
 	info("0x%04x 0x%04x: pmt_pid 0x%04x %s -- %s (%s%s)\n",
 	    s->transport_stream_id,
@@ -2118,7 +2509,10 @@ static const char *usage = "\n"
 	"	-P do not use ATSC PSIP tables for scanning\n"
 	"	    (but only PAT and PMT) (applies for ATSC only)\n"
 	"	-A N	check for ATSC 1=Terrestrial [default], 2=Cable or 3=both\n"
-	"	-U	Uniquely name unknown services\n";
+	"	-U	Uniquely name unknown services\n"
+	"	-C cs	Override default charset for service name/provider (default = ISO-6937)\n"
+	"	-D cs	Output charset (default = %s)\n"
+	"Supported charsets by -C/-D parameters can be obtained via 'iconv -l' command\n";
 
 void
 bad_usage(char *pname, int problem)
@@ -2130,7 +2524,7 @@ bad_usage(char *pname, int problem)
 	switch (problem) {
 	default:
 	case 0:
-		fprintf (stderr, usage, pname);
+		fprintf (stderr, usage, pname, output_charset);
 		break;
 	case 1:
 		i = 0;
@@ -2158,15 +2552,36 @@ int main (int argc, char **argv)
 	int frontend_fd;
 	int fe_open_mode;
 	const char *initial = NULL;
+	char *charset;
 
 	if (argc <= 1) {
 	    bad_usage(argv[0], 2);
 	    return -1;
 	}
 
+	/*
+	 * Get the environment charset, and use it as the default
+	 * output charset. In thesis, using nl_langinfo should be
+	 * enough, but, in my tests, it is not as reliable as checking
+	 * the environment vars directly.
+	 */
+	if ((charset = getenv("LC_ALL")) ||
+	    (charset = getenv("LC_CTYPE")) ||
+	    (charset = getenv ("LANG"))) {
+		while (*charset != '.' && *charset)
+			charset++;
+		if (*charset == '.')
+			charset++;
+		if (*charset)
+			output_charset = charset;
+		else
+			output_charset = nl_langinfo(CODESET);
+	} else
+		output_charset = nl_langinfo(CODESET);
+
 	/* start with default lnb type */
 	lnb_type = *lnb_enum(0);
-	while ((opt = getopt(argc, argv, "5cnpa:f:d:s:o:x:e:t:i:l:vquPA:U")) != -1) {
+	while ((opt = getopt(argc, argv, "5cnpa:f:d:s:o:x:e:t:i:l:vquPA:UC:D:")) != -1) {
 		switch (opt) {
 		case 'a':
 			adapter = strtoul(optarg, NULL, 0);
@@ -2246,6 +2661,12 @@ int main (int argc, char **argv)
 		case 'U':
 			unique_anon_services = 1;
 			break;
+		case 'C':
+			default_charset = optarg;
+			break;
+		case 'D':
+			output_charset = optarg;
+			break;
 		default:
 			bad_usage(argv[0], 0);
 			return -1;
diff --git a/util/szap/azap.c b/util/szap/azap.c
index 93addf8..ea13236 100644
--- a/util/szap/azap.c
+++ b/util/szap/azap.c
@@ -171,7 +171,7 @@ int try_parse_param(int fd, const Param * plist, int list_size, int *param,
 
 
 int parse(const char *fname, const char *channel,
-	  struct dvb_frontend_parameters *frontend, int *vpid, int *apid)
+	  struct dvb_frontend_parameters *frontend, int *vpid, int *apid, int *sid)
 {
 	int fd;
 	int err;
@@ -204,6 +204,9 @@ int parse(const char *fname, const char *channel,
 	if ((err = try_parse_int(fd, apid, "Audio PID")))
 		return -6;
 
+	if ((err = try_parse_int(fd, sid, "Service ID")))
+		return -7;
+
 	close(fd);
 
 	return 0;
@@ -266,7 +269,7 @@ int check_frontend (int fe_fd)
 }
 
 
-static const char *usage = "\nusage: %s [-a adapter_num] [-f frontend_id] [-d demux_id] [-c conf_file] [-r] <channel name>\n\n";
+static const char *usage = "\nusage: %s [-a adapter_num] [-f frontend_id] [-d demux_id] [-c conf_file] [-r] [-p] <channel name>\n\n";
 
 
 int main(int argc, char **argv)
@@ -276,11 +279,13 @@ int main(int argc, char **argv)
 	char *confname = NULL;
 	char *channel = NULL;
 	int adapter = 0, frontend = 0, demux = 0, dvr = 0;
-	int vpid, apid;
+	int vpid, apid, sid, pmtpid = 0;
+	int pat_fd, pmt_fd;
 	int frontend_fd, audio_fd, video_fd;
 	int opt;
+	int rec_psi = 0;
 
-	while ((opt = getopt(argc, argv, "hrn:a:f:d:c:")) != -1) {
+	while ((opt = getopt(argc, argv, "hrpn:a:f:d:c:")) != -1) {
 		switch (opt) {
 		case 'a':
 			adapter = strtoul(optarg, NULL, 0);
@@ -294,6 +299,9 @@ int main(int argc, char **argv)
 		case 'r':
 			dvr = 1;
 			break;
+		case 'p':
+			rec_psi = 1;
+			break;
 		case 'c':
 			confname = optarg;
 			break;
@@ -333,7 +341,7 @@ int main(int argc, char **argv)
 
 	memset(&frontend_param, 0, sizeof(struct dvb_frontend_parameters));
 
-	if (parse (confname, channel, &frontend_param, &vpid, &apid))
+	if (parse (confname, channel, &frontend_param, &vpid, &apid, &sid))
 		return -1;
 
 	if ((frontend_fd = open(FRONTEND_DEV, O_RDWR)) < 0) {
@@ -344,6 +352,29 @@ int main(int argc, char **argv)
 	if (setup_frontend (frontend_fd, &frontend_param) < 0)
 		return -1;
 
+
+        if (rec_psi) {
+            pmtpid = get_pmt_pid(DEMUX_DEV, sid);
+            if (pmtpid <= 0) {
+                fprintf(stderr,"couldn't find pmt-pid for sid %04x\n",sid);
+                return -1;
+            }
+
+            if ((pat_fd = open(DEMUX_DEV, O_RDWR)) < 0) {
+                perror("opening pat demux failed");
+                return -1;
+            }
+            if (set_pesfilter(pat_fd, 0, DMX_PES_OTHER, dvr) < 0)
+                return -1;
+
+            if ((pmt_fd = open(DEMUX_DEV, O_RDWR)) < 0) {
+                perror("opening pmt demux failed");
+                return -1;
+            }
+            if (set_pesfilter(pmt_fd, pmtpid, DMX_PES_OTHER, dvr) < 0)
+                return -1;
+        }
+
         if ((video_fd = open(DEMUX_DEV, O_RDWR)) < 0) {
                 PERROR("failed opening '%s'", DEMUX_DEV);
                 return -1;
@@ -363,6 +394,8 @@ int main(int argc, char **argv)
 
 	check_frontend (frontend_fd);
 
+        close (pat_fd);
+        close (pmt_fd);
 	close (audio_fd);
 	close (video_fd);
 	close (frontend_fd);
author	etobi <git@e-tobi.net>	2013-09-03 09:48:47 +0200
committer	etobi <git@e-tobi.net>	2013-09-03 09:48:47 +0200
commit	76c08672bc6c2984ebd7045a71862099890c9118 (patch)
tree	31e3232493a151138c510886eb97ad4362623357
parent	9fe4d4ea9c054e539ab679ed2e9c076c35beb69d (diff)
download	linux-dvb-apps-75969ecb28bdd717fd01eb0f484889d8225408c2.tar.gz