[linuxtv-dvb-apps] 18/30: Imported Upstream version 1.1.1+rev1273

Tobias Grimm tiber-guest at alioth.debian.org
Tue Sep 3 07:52:05 UTC 2013


This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository linuxtv-dvb-apps.

commit 9a5228e0f2b898367b7943d294be58caf6ce8bb3
Author: etobi <git at e-tobi.net>
Date:   Tue Sep 3 09:48:44 2013 +0200

    Imported Upstream version 1.1.1+rev1273
---
 .hg_archival.txt                                   |    2 +-
 lib/libucsi/dvb/Makefile                           |    2 +
 lib/libucsi/dvb/descriptor.h                       |    1 +
 lib/libucsi/dvb/mpe_fec_section.h                  |   73 ++++++++++++++
 lib/libucsi/dvb/section.h                          |    1 +
 .../dvb/time_slice_fec_identifier_descriptor.h     |   94 ++++++++++++++++++
 lib/libucsi/mpeg/Makefile                          |    1 +
 lib/libucsi/mpeg/datagram_section.h                |   81 +++++++++++++++
 lib/libucsi/mpeg/section.h                         |    2 +
 util/av7110_loadkeys/technotrend.rc5               |   41 ++++++++
 util/gnutv/gnutv.c                                 |   12 ++-
 util/gnutv/gnutv_data.c                            |   34 ++++++-
 util/gnutv/gnutv_data.h                            |    2 +-
 util/scan/atsc/us-NY-TWC-NYC                       |   53 ----------
 util/scan/dvb-c/at-KarrerNet                       |   18 ++++
 util/scan/dvb-c/at-SalzburgAG                      |    1 -
 util/scan/dvb-c/ch-Rega-Sense                      |   34 +++++++
 util/scan/dvb-c/cz-Moravianet                      |   24 +++++
 util/scan/dvb-c/de-Muenchen                        |   41 ++++----
 util/scan/dvb-c/de-Primacom                        |   48 ++++-----
 util/scan/dvb-c/de-Unitymedia                      |   62 ++++++------
 util/scan/dvb-c/dk-Copenhagen-AFDK                 |   11 +++
 util/scan/dvb-c/dk-Odense                          |   12 +--
 util/scan/dvb-c/es-Euskaltel                       |   28 +++---
 util/scan/dvb-c/lu-Ettelbruck-ACE                  |   32 +++---
 util/scan/dvb-c/no-Oslo-Get                        |   22 +++++
 util/scan/dvb-c/se-Gothnet                         |   23 +++++
 util/scan/dvb-s/Eurobird9-9.0E                     |   16 +++
 util/scan/dvb-s/Turksat-42.0E                      |  103 +++++++++++++++++++-
 util/scan/dvb-t/{fi-Kuhmoinen => ad-Andorra}       |    5 +-
 util/scan/dvb-t/{at-Offical => at-Official}        |    9 +-
 util/scan/dvb-t/au-Cairns                          |    8 +-
 util/scan/dvb-t/au-Canberra-Black-Mt               |    4 +-
 util/scan/dvb-t/au-Coonabarabran                   |   16 +++
 util/scan/dvb-t/au-Hobart                          |   10 +-
 util/scan/dvb-t/au-SunshineCoast                   |   18 ++--
 util/scan/dvb-t/au-canberra                        |    4 +-
 util/scan/dvb-t/be-Brussels                        |    5 +
 util/scan/dvb-t/ch-All                             |    6 +-
 util/scan/dvb-t/ch-Citycable                       |   28 +++---
 util/scan/dvb-t/cz-Brno                            |   10 +-
 util/scan/dvb-t/cz-Klet                            |    4 +
 util/scan/dvb-t/cz-Plzen                           |    8 ++
 util/scan/dvb-t/cz-Praha                           |    6 +-
 util/scan/dvb-t/de-Aachen_Stadt                    |    6 --
 util/scan/dvb-t/de-Baden-Wuerttemberg              |   20 ++++
 util/scan/dvb-t/de-Bayern                          |   40 ++++++++
 util/scan/dvb-t/de-Berlin                          |   18 ++--
 util/scan/dvb-t/de-Bielefeld                       |    7 --
 util/scan/dvb-t/de-Brandenburg                     |    7 ++
 util/scan/dvb-t/de-Braunschweig                    |    7 --
 util/scan/dvb-t/de-Bremen                          |   16 +--
 util/scan/dvb-t/de-Brocken_Magdeburg               |    7 --
 util/scan/dvb-t/de-Chemnitz                        |    5 -
 util/scan/dvb-t/de-Dresden                         |    5 -
 util/scan/dvb-t/de-Erfurt-Weimar                   |    5 -
 util/scan/dvb-t/de-Frankfurt                       |   41 --------
 util/scan/dvb-t/de-Freiburg                        |    5 -
 util/scan/dvb-t/de-HalleSaale                      |    6 --
 util/scan/dvb-t/de-Hamburg                         |   27 ++---
 util/scan/dvb-t/de-Hannover                        |    7 --
 util/scan/dvb-t/de-Hessen                          |   19 ++++
 util/scan/dvb-t/de-Kassel                          |   31 ------
 util/scan/dvb-t/de-Kiel                            |    8 --
 util/scan/dvb-t/de-Koeln-Bonn                      |    9 --
 util/scan/dvb-t/de-Leipzig                         |    5 -
 util/scan/dvb-t/de-Loerrach                        |   19 ----
 util/scan/dvb-t/de-Luebeck                         |    7 --
 util/scan/dvb-t/de-Mecklenburg-Vorpommern          |   12 +++
 util/scan/dvb-t/de-Muenchen                        |   10 --
 util/scan/dvb-t/de-Niedersachsen                   |   40 ++++++++
 util/scan/dvb-t/de-Nordrhein-Westfalen             |   27 +++++
 util/scan/dvb-t/de-Nuernberg                       |    8 --
 util/scan/dvb-t/de-Osnabrueck                      |    5 -
 util/scan/dvb-t/de-Ostbayern                       |   11 ---
 util/scan/dvb-t/de-Ravensburg                      |    8 --
 util/scan/dvb-t/de-Rheinland-Pfalz                 |   12 +++
 util/scan/dvb-t/de-Rostock                         |    4 -
 util/scan/dvb-t/de-Ruhrgebiet                      |   19 ----
 util/scan/dvb-t/de-Saarland                        |    7 ++
 util/scan/dvb-t/de-Sachsen                         |   12 +++
 util/scan/dvb-t/de-Sachsen-Anhalt                  |   12 +++
 util/scan/dvb-t/de-Schleswig-Holstein              |   18 ++++
 util/scan/dvb-t/de-Schwerin                        |    4 -
 util/scan/dvb-t/de-Stuttgart                       |    6 --
 util/scan/dvb-t/de-Thueringen                      |   10 ++
 util/scan/dvb-t/de-Wuerzburg                       |    7 --
 util/scan/dvb-t/dk-All                             |    1 +
 util/scan/dvb-t/es-Albacete                        |   12 +--
 util/scan/dvb-t/es-Alicante                        |   14 +--
 util/scan/dvb-t/es-Alpicat                         |   12 +--
 util/scan/dvb-t/es-Bilbao                          |   12 +--
 util/scan/dvb-t/es-Cadiz                           |    8 ++
 util/scan/dvb-t/es-Carceres                        |   18 ++--
 util/scan/dvb-t/es-Donostia                        |   12 +--
 util/scan/dvb-t/es-Las_Palmas                      |   10 +-
 util/scan/dvb-t/es-Madrid                          |   16 +--
 util/scan/dvb-t/es-Malaga                          |   12 +--
 util/scan/dvb-t/es-Mussara                         |   12 +--
 util/scan/dvb-t/es-Santander                       |    8 +-
 util/scan/dvb-t/es-Valencia                        |    9 ++
 util/scan/dvb-t/es-Valladolid                      |   10 +-
 util/scan/dvb-t/es-Zaragoza                        |   10 +-
 .../{fi-Salla_Ihistysjanka => fi-Inari_Janispaa}   |    4 +-
 .../dvb-t/{fi-Salla_Saija => fi-Inari_Naatamo}     |    2 +-
 .../{fi-Nurmes_Porokyla => fi-Kuhmo_Tikkasenmaki}  |    2 +-
 util/scan/dvb-t/fi-Kuhmoinen                       |    2 +-
 ...i-Salla_Ihistysjanka => fi-Kuusamo_Hamppulampi} |    2 +-
 .../{fi-Nurmes_Porokyla => fi-Nurmes_Kortevaara}   |    0
 util/scan/dvb-t/fi-Parikkala                       |    1 +
 util/scan/dvb-t/fi-Rautjarvi_Simpele               |    2 +-
 util/scan/dvb-t/fi-Salla_Ihistysjanka              |    2 +-
 .../{fi-Salla_Ihistysjanka => fi-Salla_Sarivaara}  |    2 +-
 util/scan/dvb-t/fi-Salo_Isokyla                    |    2 +-
 .../{fi-Sipoo_Galthagen => fi-Sipoo_Norrkulla}     |    0
 ...alla_Ihistysjanka => fi-Suomussalmi_Myllylahti} |    4 +-
 .../{fi-Salla_Ihistysjanka => fi-Utsjoki_Nuvvus}   |    4 +-
 util/scan/dvb-t/fr-Cluses                          |   21 ++--
 util/scan/dvb-t/fr-Dijon                           |   36 ++++---
 util/scan/dvb-t/fr-Lyon-Fourviere                  |    3 +-
 util/scan/dvb-t/fr-Montbeliard                     |   18 ++++
 util/scan/dvb-t/fr-Paris                           |    2 +-
 util/scan/dvb-t/fr-Strasbourg                      |   42 +++-----
 util/scan/dvb-t/hk-HongKong                        |   18 ++++
 util/scan/dvb-t/it-Aosta                           |   12 +--
 util/scan/dvb-t/it-Bari                            |   16 +--
 util/scan/dvb-t/it-Bologna                         |   26 ++---
 util/scan/dvb-t/it-Bolzano                         |    2 +-
 util/scan/dvb-t/it-Cagliari                        |   52 +++++-----
 util/scan/dvb-t/it-Caivano                         |   25 ++---
 util/scan/dvb-t/it-Catania                         |   22 ++---
 util/scan/dvb-t/it-Conero                          |    6 +-
 util/scan/dvb-t/it-Firenze                         |   18 ++--
 util/scan/dvb-t/it-Genova                          |   10 +-
 util/scan/dvb-t/it-Livorno                         |   12 +--
 util/scan/dvb-t/it-Milano                          |   14 +--
 util/scan/dvb-t/it-Palermo                         |   18 ++--
 util/scan/dvb-t/it-Pescara                         |   15 +++
 util/scan/dvb-t/it-Pisa                            |   16 +--
 util/scan/dvb-t/it-Roma                            |   14 +--
 util/scan/dvb-t/it-S-Stefano_al_mare               |   19 ++++
 util/scan/dvb-t/it-Sassari                         |   40 ++++----
 util/scan/dvb-t/it-Trieste                         |   16 +--
 util/scan/dvb-t/it-Varese                          |   10 +-
 util/scan/dvb-t/it-Venezia                         |   14 +--
 util/scan/dvb-t/it-Verona                          |   19 ++++
 util/scan/dvb-t/lv-Riga                            |   12 +--
 util/scan/dvb-t/nl-All                             |    8 +-
 util/scan/dvb-t/no-Trondelag_Stjordal              |    7 ++
 util/scan/dvb-t/nz-Waiatarua                       |    6 +-
 util/scan/dvb-t/pl-Rzeszow                         |    3 +
 util/scan/dvb-t/pl-Warszawa                        |    4 +
 util/scan/dvb-t/se-Karlstad_Sormon                 |    6 +-
 util/scan/dvb-t/se-Sodertalje_Ragnhildsborg        |    9 +-
 154 files changed, 1506 insertions(+), 864 deletions(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
index f91aca6..64b0306 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,2 +1,2 @@
 repo: d9fe7e17226f8e321aa80a015fc8d53f33b265d7
-node: 63dae165ffe8ae0e605fa46b77062289a873c0fb
+node: 2d700fe04e4386a32e37f3a1291cacafd375aa60
diff --git a/lib/libucsi/dvb/Makefile b/lib/libucsi/dvb/Makefile
index 78876dc..6f36e11 100644
--- a/lib/libucsi/dvb/Makefile
+++ b/lib/libucsi/dvb/Makefile
@@ -61,6 +61,7 @@ includes = ac3_descriptor.h                                    \
            local_time_offset_descriptor.h                      \
            mhp_data_broadcast_id_descriptor.h                  \
            mosaic_descriptor.h                                 \
+           mpe_fec_section.h                                   \
            multilingual_bouquet_name_descriptor.h              \
            multilingual_component_descriptor.h                 \
            multilingual_network_name_descriptor.h              \
@@ -106,6 +107,7 @@ includes = ac3_descriptor.h                                    \
            terrestrial_delivery_descriptor.h                   \
            time_shifted_event_descriptor.h                     \
            time_shifted_service_descriptor.h                   \
+           time_slice_fec_identifier_descriptor.h              \
            tot_section.h                                       \
            transport_stream_descriptor.h                       \
            tva_container_section.h                             \
diff --git a/lib/libucsi/dvb/descriptor.h b/lib/libucsi/dvb/descriptor.h
index 303e17a..345f6f0 100644
--- a/lib/libucsi/dvb/descriptor.h
+++ b/lib/libucsi/dvb/descriptor.h
@@ -88,6 +88,7 @@ extern "C"
 #include <libucsi/dvb/terrestrial_delivery_descriptor.h>
 #include <libucsi/dvb/time_shifted_event_descriptor.h>
 #include <libucsi/dvb/time_shifted_service_descriptor.h>
+#include <libucsi/dvb/time_slice_fec_identifier_descriptor.h>
 #include <libucsi/dvb/transport_stream_descriptor.h>
 #include <libucsi/dvb/tva_id_descriptor.h>
 #include <libucsi/dvb/vbi_data_descriptor.h>
diff --git a/lib/libucsi/dvb/mpe_fec_section.h b/lib/libucsi/dvb/mpe_fec_section.h
new file mode 100644
index 0000000..6db0a47
--- /dev/null
+++ b/lib/libucsi/dvb/mpe_fec_section.h
@@ -0,0 +1,73 @@
+/*
+ * section and descriptor parser
+ *
+ * Copyright (C) 2005 Kenneth Aafloy (kenneth at linuxtv.org)
+ * Copyright (C) 2005 Andrew de Quincey (adq_dvb at lidskialf.net)
+ * Copyright (C) 2008 Patrick Boettcher (pb at linuxtv.org)
+ *
+ * This library 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 library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef _UCSI_DVB_MPE_FEC_SECTION_H
+#define _UCSI_DVB_MPE_FEC_SECTION_H 1
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <libucsi/mpeg/section.h>
+
+/**
+ * mpe_fec_section structure. TODO
+ */
+struct mpe_fec_section {
+	struct section head;
+};
+
+
+/**
+ * real_time_paramters
+ * can also be found in datagram_section in MAC4-1-bytes */
+struct real_time_parameters {
+  EBIT4(uint32_t delta_t         : 12; ,
+	uint32_t table_boundary  : 1;  ,
+	uint32_t frame_boundary  : 1;  ,
+	uint32_t address         : 18; )
+};
+
+
+static inline struct real_time_parameters * datagram_section_real_time_parameters_codec(struct datagram_section *d)
+{
+	struct real_time_parameters *rt = (struct real_time_parameters *) &d->MAC_address_4;
+	uint8_t b[4];
+	b[0] = d->MAC_address_4;
+	b[1] = d->MAC_address_3;
+	b[2] = d->MAC_address_2;
+	b[3] = d->MAC_address_1;
+
+	rt->delta_t = (b[0] << 4) | ((b[1] >> 4) & 0x0f);
+	rt->table_boundary = (b[1] >> 3) & 0x1;
+	rt->frame_boundary = (b[1] >> 2) & 0x1;
+	rt->address        = ((b[1] & 0x3) << 16) | (b[2] << 8) | b[3];
+
+	return rt;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/lib/libucsi/dvb/section.h b/lib/libucsi/dvb/section.h
index 8488d71..70e0880 100644
--- a/lib/libucsi/dvb/section.h
+++ b/lib/libucsi/dvb/section.h
@@ -39,6 +39,7 @@ extern "C"
 #include <libucsi/dvb/tot_section.h>
 #include <libucsi/dvb/tva_container_section.h>
 #include <libucsi/dvb/int_section.h>
+#include <libucsi/dvb/mpe_fec_section.h>
 
 /**
  * The following are not implemented just now.
diff --git a/lib/libucsi/dvb/time_slice_fec_identifier_descriptor.h b/lib/libucsi/dvb/time_slice_fec_identifier_descriptor.h
new file mode 100644
index 0000000..00f3048
--- /dev/null
+++ b/lib/libucsi/dvb/time_slice_fec_identifier_descriptor.h
@@ -0,0 +1,94 @@
+/*
+ * section and descriptor parser
+ *
+ * Copyright (C) 2005 Kenneth Aafloy (kenneth at linuxtv.org)
+ * Copyright (C) 2005 Andrew de Quincey (adq_dvb at lidskialf.net)
+ * Copyright (C) 2008 Patrick Boettcher (pb at linuxtv.org)
+ *
+ * This library 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 library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef _UCSI_DVB_TIME_SLICE_FEC_IDENTIFIER_DESCRIPTOR
+#define _UCSI_DVB_TIME_SLICE_FEC_IDENTIFIER_DESCRIPTOR 1
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <libucsi/descriptor.h>
+#include <libucsi/types.h>
+
+/*
+ * dvb_time_slice_fec_identifier_descriptor structure.
+ */
+struct dvb_time_slice_fec_identifier_descriptor {
+	struct descriptor d;
+
+  EBIT4(uint8_t time_slicing		:1;  ,
+	uint8_t mpe_fec			:2;  ,
+	uint8_t reserved		:2;  ,
+	uint8_t frame_size		:3;  );
+
+	uint8_t max_burst_duration;
+
+  EBIT2(uint8_t max_average_rate	:4;  ,
+	uint8_t time_slice_fec_id	:4;  );
+	/* id_selector_bytes[] */
+};
+
+static inline struct dvb_time_slice_fec_identifier_descriptor *
+	dvb_time_slice_fec_identifier_descriptor_codec(struct descriptor* d)
+{
+	if (d->len < 3)
+		return NULL;
+	return (struct dvb_time_slice_fec_identifier_descriptor *) d;
+}
+
+static inline uint8_t dvb_time_slice_fec_identifier_selector_byte_length(struct dvb_time_slice_fec_identifier_descriptor *d)
+{
+	return d->d.len - 3;
+}
+
+static inline uint8_t * dvb_time_slice_fec_identifier_selector_bytes(struct dvb_time_slice_fec_identifier_descriptor *d)
+{
+	if (d->d.len < 3)
+		return NULL;
+	else
+		return ((uint8_t *) d) + 2 + 3;
+}
+
+static inline uint16_t dvb_time_slice_fec_identifier_max_burst_duration_msec(struct dvb_time_slice_fec_identifier_descriptor *d)
+{
+	return (d->max_burst_duration + 1) * 20;
+}
+
+static inline uint16_t dvb_time_slice_fec_identifier_frame_size_kbits(struct dvb_time_slice_fec_identifier_descriptor *d)
+{
+	if (d->frame_size > 3)
+		return 0;
+	return (d->frame_size+1) * 512;
+}
+
+static inline uint16_t dvb_time_slice_fec_identifier_frame_size_rows(struct dvb_time_slice_fec_identifier_descriptor *d)
+{
+	return dvb_time_slice_fec_identifier_frame_size_kbits(d) / 2;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/lib/libucsi/mpeg/Makefile b/lib/libucsi/mpeg/Makefile
index ace8808..43bc91d 100644
--- a/lib/libucsi/mpeg/Makefile
+++ b/lib/libucsi/mpeg/Makefile
@@ -24,6 +24,7 @@ includes = audio_stream_descriptor.h                 \
            content_labelling_descriptor.h            \
            copyright_descriptor.h                    \
            data_stream_alignment_descriptor.h        \
+           datagram_section.h                        \
            descriptor.h                              \
            external_es_id_descriptor.h               \
            fmc_descriptor.h                          \
diff --git a/lib/libucsi/mpeg/datagram_section.h b/lib/libucsi/mpeg/datagram_section.h
new file mode 100644
index 0000000..769773a
--- /dev/null
+++ b/lib/libucsi/mpeg/datagram_section.h
@@ -0,0 +1,81 @@
+/*
+ * section and descriptor parser
+ *
+ * Copyright (C) 2005 Kenneth Aafloy (kenneth at linuxtv.org)
+ * Copyright (C) 2005 Andrew de Quincey (adq_dvb at lidskialf.net)
+ * Copyright (C) 2008 Patrick Boettcher (pb at linuxtv.org)
+ *
+ * This library 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 library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef _UCSI_MPEG_DATAGRAM_SECTION_H
+#define _UCSI_MPEG_DATAGRAM_SECTION_H 1
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <libucsi/section.h>
+
+/**
+ * datagram_section structure.
+ */
+struct datagram_section {
+	struct section head;
+
+	uint8_t MAC_address_6;
+	uint8_t MAC_address_5;
+ EBIT5(uint8_t reserved                   : 2; ,
+	uint8_t payload_scrambling_control : 2; ,
+	uint8_t address_scrambling_control : 2; ,
+	uint8_t LLC_SNAP_flag              : 1; ,
+	uint8_t current_next_indicator     : 1; );
+	uint8_t section_number;
+	uint8_t last_section_number;
+	uint8_t MAC_address_4;
+	uint8_t MAC_address_3;
+	uint8_t MAC_address_2;
+	uint8_t MAC_address_1;
+
+	/* LLC_SNAP or IP-data */
+	/* if last section stuffing */
+	/* CRC */
+} __ucsi_packed;
+
+/**
+ */
+static inline struct datagram_section *datagram_section_codec(struct section *section)
+{
+	/* something to do here ? */
+	return (struct datagram_section *) section;
+}
+
+static inline uint8_t *datagram_section_ip_data(struct datagram_section *d)
+{
+	return (uint8_t *) d + sizeof(struct section) + 2 + 1 + 1 + 1 + 4;
+}
+
+static inline size_t datagram_section_ip_data_length(struct datagram_section *d)
+{
+	return section_length(&d->head) - (sizeof(struct section) + 2 + 1 + 1 + 1 + 4) - CRC_SIZE;
+}
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/lib/libucsi/mpeg/section.h b/lib/libucsi/mpeg/section.h
index 7dbff93..f71f95e 100644
--- a/lib/libucsi/mpeg/section.h
+++ b/lib/libucsi/mpeg/section.h
@@ -33,6 +33,7 @@ extern "C"
 #include <libucsi/mpeg/pmt_section.h>
 #include <libucsi/mpeg/tsdt_section.h>
 #include <libucsi/mpeg/metadata_section.h>
+#include <libucsi/mpeg/datagram_section.h>
 
 #define TRANSPORT_PAT_PID 0x00
 #define TRANSPORT_CAT_PID 0x01
@@ -49,6 +50,7 @@ enum mpeg_section_tag {
 	stag_mpeg_iso14496_scene_description		= 0x04,
 	stag_mpeg_iso14496_object_description		= 0x05,
 	stag_mpeg_metadata				= 0x06,
+	stag_mpeg_datagram				= 0x3e,
 };
 
 #ifdef __cplusplus
diff --git a/util/av7110_loadkeys/technotrend.rc5 b/util/av7110_loadkeys/technotrend.rc5
new file mode 100644
index 0000000..526fdc7
--- /dev/null
+++ b/util/av7110_loadkeys/technotrend.rc5
@@ -0,0 +1,41 @@
+0x22 KEY_EPG
+0x1a KEY_RADIO
+0x19 KEY_TEXT
+
+0x0c KEY_0
+0x03 KEY_1
+0x04 KEY_2
+0x05 KEY_3
+0x06 KEY_4
+0x07 KEY_5
+0x08 KEY_6
+0x09 KEY_7
+0x0a KEY_8
+0x0b KEY_9
+
+0x0d KEY_UP
+0x11 KEY_DOWN
+0x25 KEY_VOLUMEUP
+0x26 KEY_VOLUMEDOWN
+
+0x23 KEY_CHANNELUP
+0x24 KEY_CHANNELDOWN
+
+0x01 KEY_POWER
+0x13 KEY_BACK
+0x02 KEY_MENU
+0x14 KEY_RED
+0x15 KEY_GREEN
+0x16 KEY_YELLOW
+0x0f KEY_OK
+0x17 KEY_BLUE
+0x18 KEY_MUTE
+0x3d KEY_REWIND
+0x3b KEY_PLAY
+0x3f KEY_FORWARD
+0x3a KEY_RECORD
+0x3c KEY_STOP
+0x3e KEY_PAUSE
+0x0e KEY_LEFT
+0x10 KEY_RIGHT
+0x12 KEY_INFO
diff --git a/util/gnutv/gnutv.c b/util/gnutv/gnutv.c
index 62f19be..f824c65 100644
--- a/util/gnutv/gnutv.c
+++ b/util/gnutv/gnutv.c
@@ -66,6 +66,7 @@ void usage(void)
 		"			 * C-MULTI - Big Dish - Multipoint LNBf, 3700 to 4200 MHz,\n"
 		"						Dual LO, H:5150MHz, V:5750MHz.\n"
 		"			 * One of the sec definitions from the secfile if supplied\n"
+		" -buffer <size>	Custom DVR buffer size\n"
 		" -out decoder		Output to hardware decoder (default)\n"
 		"      decoderabypass	Output to hardware decoder using audio bypass\n"
 		"      dvr		Output stream to dvr device\n"
@@ -124,6 +125,7 @@ int main(int argc, char *argv[])
 	struct gnutv_ca_params gnutv_ca_params;
 	int ffaudiofd = -1;
 	int usertp = 0;
+	int buffer_size = 0;
 
 	while(argpos != argc) {
 		if (!strcmp(argv[argpos], "-h")) {
@@ -167,6 +169,14 @@ int main(int argc, char *argv[])
 				usage();
 			secid = argv[argpos+1];
 			argpos+=2;
+		} else if (!strcmp(argv[argpos], "-buffer")) {
+			if ((argc - argpos) < 2)
+				usage();
+			if (sscanf(argv[argpos+1], "%i", &buffer_size) != 1)
+				usage();
+			if (buffer_size < 0)
+				usage();
+			argpos+=2;
 		} else if (!strcmp(argv[argpos], "-out")) {
 			if ((argc - argpos) < 2)
 				usage();
@@ -320,7 +330,7 @@ int main(int argc, char *argv[])
 		gnutv_dvb_start(&gnutv_dvb_params);
 
 		// start the data stuff
-		gnutv_data_start(output_type, ffaudiofd, adapter_id, demux_id, outfile, outif, outaddrs, usertp);
+		gnutv_data_start(output_type, ffaudiofd, adapter_id, demux_id, buffer_size, outfile, outif, outaddrs, usertp);
 	}
 
 	// the UI
diff --git a/util/gnutv/gnutv_data.c b/util/gnutv/gnutv_data.c
index 7ac0f23..54ccdde 100644
--- a/util/gnutv/gnutv_data.c
+++ b/util/gnutv/gnutv_data.c
@@ -77,7 +77,7 @@ static struct pid_fd *pid_fds = NULL;
 static int pid_fds_count = 0;
 
 void gnutv_data_start(int _output_type,
-		    int ffaudiofd, int _adapter_id, int _demux_id,
+		    int ffaudiofd, int _adapter_id, int _demux_id, int buffer_size,
 		    char *outfile,
 		    char* outif, struct addrinfo *_outaddrs, int _usertp)
 {
@@ -114,6 +114,14 @@ void gnutv_data_start(int _output_type,
 			exit(1);
 		}
 
+		// optionally set dvr buffer size
+		if (buffer_size > 0) {
+			if (dvbdemux_set_buffer(dvrfd, buffer_size) != 0) {
+				fprintf(stderr, "Failed to set DVR buffer size\n");
+				exit(1);
+			}
+		}
+
 		pthread_create(&outputthread, NULL, fileoutputthread_func, NULL);
 		break;
 
@@ -142,6 +150,14 @@ void gnutv_data_start(int _output_type,
 			exit(1);
 		}
 
+		// optionally set dvr buffer size
+		if (buffer_size > 0) {
+			if (dvbdemux_set_buffer(dvrfd, buffer_size) != 0) {
+				fprintf(stderr, "Failed to set DVR buffer size\n");
+				exit(1);
+			}
+		}
+
 		pthread_create(&outputthread, NULL, udpoutputthread_func, NULL);
 		break;
 	}
@@ -220,19 +236,27 @@ static void *fileoutputthread_func(void* arg)
 	pollfd.events = POLLIN|POLLPRI|POLLERR;
 
 	while(!outputthread_shutdown) {
-		if (poll(&pollfd, 1, 1000) != 1)
-			continue;
-		if (pollfd.revents & POLLERR) {
+		if (poll(&pollfd, 1, 1000) == -1) {
 			if (errno == EINTR)
 				continue;
-			fprintf(stderr, "DVR device read failure\n");
+			fprintf(stderr, "DVR device poll failure\n");
 			return 0;
 		}
 
+		if (pollfd.revents == 0)
+			continue;
+
 		int size = read(dvrfd, buf, sizeof(buf));
 		if (size < 0) {
 			if (errno == EINTR)
 				continue;
+
+			if (errno == EOVERFLOW) {
+				// The error flag has been cleared, next read should succeed.
+				fprintf(stderr, "DVR overflow\n");
+				continue;
+			}
+
 			fprintf(stderr, "DVR device read failure\n");
 			return 0;
 		}
diff --git a/util/gnutv/gnutv_data.h b/util/gnutv/gnutv_data.h
index 8e47e3a..94c55c9 100644
--- a/util/gnutv/gnutv_data.h
+++ b/util/gnutv/gnutv_data.h
@@ -26,7 +26,7 @@
 #include <netdb.h>
 
 extern void gnutv_data_start(int output_type,
-			   int ffaudiofd, int adapter_id, int demux_id,
+			   int ffaudiofd, int adapter_id, int demux_id, int buffer_size,
 			   char *outfile,
 			   char* outif, struct addrinfo *outaddrs, int usertp);
 extern void gnutv_data_stop(void);
diff --git a/util/scan/atsc/us-NY-TWC-NYC b/util/scan/atsc/us-NY-TWC-NYC
deleted file mode 100644
index 932b377..0000000
--- a/util/scan/atsc/us-NY-TWC-NYC
+++ /dev/null
@@ -1,53 +0,0 @@
-#initial tuning data for Time Warner Cable in New York City
-
-#80
-A 561000000 QAM256
-A 567000000 QAM256
-A 573000000 QAM256
-A 579000000 QAM256
-A 585000000 QAM256
-A 591000000 QAM256
-A 597000000 QAM256
-A 603000000 QAM256
-A 609000000 QAM256
-A 615000000 QAM256
-#90
-A 621000000 QAM256
-A 627000000 QAM256
-A 633000000 QAM256
-A 639000000 QAM256
-A 645000000 QAM256
-A  93000000 QAM256
-A  99000000 QAM256
-A 105000000 QAM256
-A 111025000 QAM256
-A 117025000 QAM256
-#100
-A 651000000 QAM256
-A 657000000 QAM256
-A 663000000 QAM256
-A 669000000 QAM256
-A 675000000 QAM256
-A 681000000 QAM256
-A 687000000 QAM256
-A 693000000 QAM256
-A 699000000 QAM256
-A 705000000 QAM256
-#110
-A 711000000 QAM256
-A 717000000 QAM256
-A 723000000 QAM256
-A 729000000 QAM256
-A 735000000 QAM256
-A 741000000 QAM256
-A 747000000 QAM256
-A 753000000 QAM256
-A 759000000 QAM256
-A 765000000 QAM256
-#120
-A 771000000 QAM256
-A 777000000 QAM256
-A 783000000 QAM256
-A 789000000 QAM256
-A 795000000 QAM256
-A 801000000 QAM256
diff --git a/util/scan/dvb-c/at-KarrerNet b/util/scan/dvb-c/at-KarrerNet
new file mode 100644
index 0000000..27e143a
--- /dev/null
+++ b/util/scan/dvb-c/at-KarrerNet
@@ -0,0 +1,18 @@
+# Kabel St. Florian bei Linz/AT KarrerNet
+# 2009-01-10
+# freq sr fec mod
+C 418000000 6900000 NONE QAM64
+C 426000000 6900000 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 474000000 6900000 NONE QAM64
+C 482000000 6900000 NONE QAM64
+C 522000000 6900000 NONE QAM64
+C 530000000 6900000 NONE QAM64
+C 538000000 6900000 NONE QAM64
+C 578000000 6900000 NONE QAM64
+C 402000000 6900000 NONE QAM256
+C 410000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/at-SalzburgAG b/util/scan/dvb-c/at-SalzburgAG
index 58fd3ce..9a03242 100644
--- a/util/scan/dvb-c/at-SalzburgAG
+++ b/util/scan/dvb-c/at-SalzburgAG
@@ -6,4 +6,3 @@ C 410000000 6900000 NONE QAM64
 C 418000000 6900000 NONE QAM64
 C 426000000 6900000 NONE QAM64
 C 442000000 6900000 NONE QAM64
-C 306000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/ch-Rega-Sense b/util/scan/dvb-c/ch-Rega-Sense
new file mode 100644
index 0000000..b072e51
--- /dev/null
+++ b/util/scan/dvb-c/ch-Rega-Sense
@@ -0,0 +1,34 @@
+# Rega Sense, Switzerland
+# freq sr fec mod
+
+# Pay TV
+C 434000000 6900000 NONE QAM64 # Teleclub
+C 714000000 6900000 NONE QAM64
+C 722000000 6900000 NONE QAM64
+
+# Basis offer
+C 125000000 6900000 NONE QAM64
+C 450000000 6900000 NONE QAM64
+C 458000000 6900000 NONE QAM64
+C 466000000 6900000 NONE QAM64
+C 474000000 6900000 NONE QAM64
+C 482000000 6900000 NONE QAM64
+C 514000000 6900000 NONE QAM64
+C 522000000 6900000 NONE QAM64
+C 578000000 6900000 NONE QAM64
+C 586000000 6900000 NONE QAM64
+C 634000000 6900000 NONE QAM64
+C 642000000 6900000 NONE QAM64
+C 650000000 6900000 NONE QAM64
+C 658000000 6900000 NONE QAM64
+C 666000000 6900000 NONE QAM64
+C 682000000 6900000 NONE QAM64
+C 698000000 6900000 NONE QAM64
+C 730000000 6900000 NONE QAM64
+
+C 618000000 6900000 NONE QAM256
+C 674000000 6900000 NONE QAM256
+
+# HDTV
+C 642000000 6900000 NONE QAM256
+C 690000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/cz-Moravianet b/util/scan/dvb-c/cz-Moravianet
new file mode 100644
index 0000000..39b379a
--- /dev/null
+++ b/util/scan/dvb-c/cz-Moravianet
@@ -0,0 +1,24 @@
+# DVB-C Moravianet (http://www.moravia.net/)
+# Available in villages and cities around Brno:
+# Bohuslavice, Bukovany, Hrusovany u Brna, Hustopece, Ivancice, Jirikovice,
+# Kyjov, Moravsky Krumlov, Mutenice, Neslovice, Nove Branice, Oslavany,
+# Popuvky, Padochov, Troubsko, Rosice, Tisnov, Vojkovice, Svatoborice,
+# Slapanice, Zabcice, Zidlochovice
+# The same content is available also from NejTV where they provide DVB-C.
+# Currently it is in Havlickuv Brod, Breclav, Velke Mezirici
+#
+# 2008-12-03
+#
+# freq      sr      fec  mod
+C 218000000 6900000 NONE QAM64
+C 226000000 6900000 NONE QAM64
+C 234000000 6900000 NONE QAM64
+C 242000000 6900000 NONE QAM64
+C 250000000 6900000 NONE QAM64
+C 258000000 6900000 NONE QAM64
+C 266000000 6900000 NONE QAM64
+C 274000000 6900000 NONE QAM64
+C 282000000 6900000 NONE QAM64
+C 290000000 6900000 NONE QAM64
+C 298000000 6900000 NONE QAM64
+C 306000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/de-Muenchen b/util/scan/dvb-c/de-Muenchen
index c963c88..e7f5b3a 100644
--- a/util/scan/dvb-c/de-Muenchen
+++ b/util/scan/dvb-c/de-Muenchen
@@ -1,24 +1,27 @@
-# 2008-04-28
+# 2008-06-22
 # Area: Muenchen City
 # Cable Provider: Kabel & Medien Service - http://www.atcable.de
 # Cable Content: Cablevista GmbH - http://www.cablevista.de
 #
 # freq sr fec mod
-C 113000000 6900000 AUTO QAM64
-C 121000000 6900000 AUTO QAM64
-C 346000000 6900000 AUTO QAM64
-C 354000000 6900000 AUTO QAM64
-C 362000000 6900000 AUTO QAM64
-C 370000000 6900000 AUTO QAM64
-C 378000000 6900000 AUTO QAM64
-C 386000000 6900000 AUTO QAM64
-C 394000000 6900000 AUTO QAM64
-C 402000000 6900000 AUTO QAM64
-C 410000000 6900000 AUTO QAM64
-C 418000000 6900000 AUTO QAM64
-C 426000000 6900000 AUTO QAM64
-C 434000000 6900000 AUTO QAM64
-C 442000000 6900000 AUTO QAM64
-C 450000000 6900000 AUTO QAM64
-C 466000000 6900000 AUTO QAM64
-C 458000000 6900000 AUTO QAM256
+C 113000000 6900000 NONE QAM64
+C 121000000 6900000 NONE QAM64
+C 346000000 6900000 NONE QAM64
+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 QAM64
+C 402000000 6900000 NONE QAM64
+C 410000000 6900000 NONE QAM64
+C 418000000 6900000 NONE QAM64
+C 426000000 6900000 NONE QAM64
+C 434000000 6900000 NONE QAM64
+C 442000000 6900000 NONE QAM64
+C 450000000 6900000 NONE QAM64
+C 466000000 6900000 NONE QAM64
+C 482000000 6900000 NONE QAM64
+C 322000000 6900000 NONE QAM256
+C 458000000 6900000 NONE QAM256
+C 490000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/de-Primacom b/util/scan/dvb-c/de-Primacom
index 3f93f75..2d4870f 100644
--- a/util/scan/dvb-c/de-Primacom
+++ b/util/scan/dvb-c/de-Primacom
@@ -1,29 +1,23 @@
 # Primacom
 # freq sr fec mod
-C 306000000 6900000 AUTO QAM64
-C 314000000 6900000 AUTO QAM64
-C 322000000 6900000 AUTO QAM64
-C 330000000 6900000 AUTO QAM64
-C 338000000 6900000 AUTO QAM64
-C 346000000 6900000 AUTO QAM64
-C 354000000 6900000 AUTO QAM64
-C 362000000 6900000 AUTO QAM64
-C 370000000 6900000 AUTO QAM64
-C 378000000 6900000 AUTO QAM64
-C 386000000 6900000 AUTO QAM64
-C 394000000 6900000 AUTO QAM64
-C 402000000 6900000 AUTO QAM64
-C 410000000 6900000 AUTO QAM64
-C 418000000 6900000 AUTO QAM64
-C 426000000 6900000 AUTO QAM64
-C 434000000 6956000 AUTO QAM64
-C 610000000 6900000 AUTO QAM64
-C 746000000 6900000 AUTO QAM64
-C 754000000 6900000 AUTO QAM64
-C 762000000 6900000 AUTO QAM64
-C 802000000 6900000 AUTO QAM64
-C 810000000 6900000 AUTO QAM64
-C 818000000 6900000 AUTO QAM64
-C 826000000 6900000 AUTO QAM64
-C 834000000 6900000 AUTO QAM64
-C 634000000 6900000 AUTO QAM256
+C 121000000 6900000 NONE QAM64
+C 306000000 6900000 NONE QAM64
+C 314000000 6900000 NONE QAM64
+C 322000000 6900000 NONE QAM64
+C 330000000 6900000 NONE QAM64
+C 338000000 6900000 NONE QAM256
+C 346000000 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 418000000 6900000 NONE QAM256
+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 610000000 6900000 NONE QAM64
+C 746000000 6900000 NONE QAM64
diff --git a/util/scan/dvb-c/de-Unitymedia b/util/scan/dvb-c/de-Unitymedia
index 96d1d38..3ba9c21 100644
--- a/util/scan/dvb-c/de-Unitymedia
+++ b/util/scan/dvb-c/de-Unitymedia
@@ -2,34 +2,34 @@
 # Created from http://www.unitymedia.de/service/tv/frequenzen.html
 # and http://blob.unitymedia.de/Download/Unitymedia_Senderlineup_digital_2008-05-28.pdf
 # freq sr fec mod
-C 113000000 6900000 AUTO QAM256
-C 121000000 6900000 AUTO QAM256
-C 338000000 6900000 AUTO QAM256
-C 346000000 6900000 AUTO QAM256
-C 354000000 6900000 AUTO QAM64
-C 362000000 6900000 AUTO QAM64
-C 370000000 6900000 AUTO QAM64
-C 378000000 6900000 AUTO QAM64
-C 386000000 6900000 AUTO QAM64
-C 394000000 6900000 AUTO QAM256
-C 402000000 6900000 AUTO QAM256
-C 410000000 6900000 AUTO QAM256
-C 418000000 6900000 AUTO QAM256
-C 426000000 6900000 AUTO QAM256
-C 434000000 6900000 AUTO QAM256
-C 442000000 6900000 AUTO QAM64
-C 450000000 6900000 AUTO QAM64
-C 458000000 6900000 AUTO QAM256
-C 466000000 6900000 AUTO QAM256
-C 474000000 6900000 AUTO QAM64
-C 522000000 6900000 AUTO QAM256
-C 530000000 6900000 AUTO QAM256
-C 538000000 6900000 AUTO QAM256
-C 554000000 6900000 AUTO QAM256
-C 562000000 6900000 AUTO QAM256
-C 570000000 6900000 AUTO QAM256
-C 610000000 6900000 AUTO QAM64
-C 650000000 6900000 AUTO QAM256
-C 658000000 6900000 AUTO QAM256
-C 666000000 6900000 AUTO QAM256
-C 674000000 6900000 AUTO QAM256
+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 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 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 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
diff --git a/util/scan/dvb-c/dk-Copenhagen-AFDK b/util/scan/dvb-c/dk-Copenhagen-AFDK
new file mode 100644
index 0000000..2baa66d
--- /dev/null
+++ b/util/scan/dvb-c/dk-Copenhagen-AFDK
@@ -0,0 +1,11 @@
+# AFDK, Copenhagen
+# http://www.afdk.tv/
+# freq sr fec mod
+C 386000000 6875000 NONE QAM64
+C 394000000 6875000 NONE QAM64
+C 402000000 6875000 NONE QAM64
+C 490000000 6875000 NONE QAM64
+C 602000000 6875000 NONE QAM64
+C 610000000 6875000 NONE QAM64
+C 618000000 6875000 NONE QAM64
+C 794000000 6875000 NONE QAM64
diff --git a/util/scan/dvb-c/dk-Odense b/util/scan/dvb-c/dk-Odense
index 132dd5a..06a00c2 100644
--- a/util/scan/dvb-c/dk-Odense
+++ b/util/scan/dvb-c/dk-Odense
@@ -2,9 +2,9 @@
 # freq sr fec mod
 C 442000000 6900000 NONE QAM64
 C 434000000 6875000 NONE QAM256
-C 255000000 5000000 2/3 QAM256
-C 506000000 6875000 2/3 QAM256
-C 562000000 6875000 2/3 QAM256
-C 610000000 6875000 2/3 QAM256
-C 754000000 6875000 2/3 QAM256
-C 770000000 6875000 2/3 QAM256
+C 255000000 5000000 NONE QAM256
+C 506000000 6875000 NONE QAM256
+C 562000000 6875000 NONE QAM256
+C 610000000 6875000 NONE QAM256
+C 754000000 6875000 NONE QAM256
+C 770000000 6875000 NONE QAM256
diff --git a/util/scan/dvb-c/es-Euskaltel b/util/scan/dvb-c/es-Euskaltel
index 7612425..46603e4 100644
--- a/util/scan/dvb-c/es-Euskaltel
+++ b/util/scan/dvb-c/es-Euskaltel
@@ -3,17 +3,17 @@
 # file automatically generated by w_scan
 # (http://free.pages.at/wirbel4vdr/w_scan/index2.html)
 # freq sr fec mod
-C 714000000 6875000 3/4 QAM64
-C 722000000 6875000 3/4 QAM64
-C 730000000 6875000 3/4 QAM64
-C 738000000 6875000 3/4 QAM64
-C 746000000 6875000 3/4 QAM64
-C 754000000 6875000 3/4 QAM64
-C 762000000 6875000 3/4 QAM64
-C 770000000 6875000 3/4 QAM64
-C 778000000 6875000 3/4 QAM64
-C 786000000 6875000 3/4 QAM64
-C 794000000 6875000 3/4 QAM64
-C 802000000 6875000 3/4 QAM64
-C 810000000 6875000 3/4 QAM64
-C 818000000 6875000 3/4 QAM64
+C 714000000 6875000 NONE QAM64
+C 722000000 6875000 NONE QAM64
+C 730000000 6875000 NONE QAM64
+C 738000000 6875000 NONE QAM64
+C 746000000 6875000 NONE QAM64
+C 754000000 6875000 NONE QAM64
+C 762000000 6875000 NONE QAM64
+C 770000000 6875000 NONE QAM64
+C 778000000 6875000 NONE QAM64
+C 786000000 6875000 NONE QAM64
+C 794000000 6875000 NONE QAM64
+C 802000000 6875000 NONE QAM64
+C 810000000 6875000 NONE QAM64
+C 818000000 6875000 NONE QAM64
diff --git a/util/scan/dvb-c/lu-Ettelbruck-ACE b/util/scan/dvb-c/lu-Ettelbruck-ACE
index ba770c2..a0222b5 100644
--- a/util/scan/dvb-c/lu-Ettelbruck-ACE
+++ b/util/scan/dvb-c/lu-Ettelbruck-ACE
@@ -2,19 +2,19 @@
 # (http://antenne-ettelbruck.lu)
 # Luxembourg - Ettelbruck
 # freq sr fec mod
-C 634000000 6900000 5/6 QAM64
-C 642000000 6900000 5/6 QAM64
-C 650000000 6900000 5/6 QAM64
-C 666000000 6900000 5/6 QAM64
-C 674000000 6900000 5/6 QAM64
-C 682000000 6900000 5/6 QAM64
-C 690000000 6900000 5/6 QAM64
-C 698000000 6900000 5/6 QAM64
-C 706000000 6900000 5/6 QAM64
-C 714000000 6900000 5/6 QAM64
-C 656000000 3450000 5/6 QAM64
-C 660000000 3450000 5/6 QAM64
-C 720000000 3450000 5/6 QAM64
-C 732000000 3450000 5/6 QAM64
-C 724000000 3450000 5/6 QAM64
-C 728000000 3450000 5/6 QAM64
+C 634000000 6900000 NONE QAM64
+C 642000000 6900000 NONE QAM64
+C 650000000 6900000 NONE QAM64
+C 666000000 6900000 NONE QAM64
+C 674000000 6900000 NONE QAM64
+C 682000000 6900000 NONE QAM64
+C 690000000 6900000 NONE QAM64
+C 698000000 6900000 NONE QAM64
+C 706000000 6900000 NONE QAM64
+C 714000000 6900000 NONE QAM64
+C 656000000 3450000 NONE QAM64
+C 660000000 3450000 NONE QAM64
+C 720000000 3450000 NONE QAM64
+C 732000000 3450000 NONE QAM64
+C 724000000 3450000 NONE QAM64
+C 728000000 3450000 NONE QAM64
diff --git a/util/scan/dvb-c/no-Oslo-Get b/util/scan/dvb-c/no-Oslo-Get
new file mode 100644
index 0000000..42e17bb
--- /dev/null
+++ b/util/scan/dvb-c/no-Oslo-Get
@@ -0,0 +1,22 @@
+# no-Oslo-Get (cable)
+C 241000000 6900000 NONE QAM256
+C 272000000 6900000 NONE QAM256
+C 280000000 6900000 NONE QAM256
+C 290000000 6900000 NONE QAM256
+C 298000000 6900000 NONE QAM256
+C 306000000 6900000 NONE QAM256
+C 314000000 6900000 NONE QAM256
+C 322000000 6900000 NONE QAM256
+C 330000000 6900000 NONE QAM256
+C 338000000 6900000 NONE QAM256
+C 346000000 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 410000000 6900000 NONE QAM256
+C 442000000 6952000 NONE QAM256
+C 482000000 6900000 NONE QAM256
+C 498000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/se-Gothnet b/util/scan/dvb-c/se-Gothnet
new file mode 100644
index 0000000..8b04ef7
--- /dev/null
+++ b/util/scan/dvb-c/se-Gothnet
@@ -0,0 +1,23 @@
+# Gothnet DVB-C
+# Updated: 2008-09-19
+# freq sr fec mod
+
+# Free channels
+C 490000000 6875000 NONE QAM64
+C 498000000 6875000 NONE QAM64
+C 506000000 6875000 NONE QAM64
+C 514000000 6875000 NONE QAM64
+
+# SPA channels
+C 682000000 6900000 NONE QAM64
+C 690000000 6900000 NONE QAM64
+C 698000000 6900000 NONE QAM64
+C 706000000 6900000 NONE QAM64
+
+# Canal Digital channels
+C 314000000 7000000 NONE QAM64
+C 322000000 7000000 NONE QAM64
+C 346000000 7000000 NONE QAM64
+C 354000000 7000000 NONE QAM64
+C 362000000 7000000 NONE QAM64
+C 370000000 7000000 NONE QAM64
diff --git a/util/scan/dvb-s/Eurobird9-9.0E b/util/scan/dvb-s/Eurobird9-9.0E
new file mode 100644
index 0000000..925980a
--- /dev/null
+++ b/util/scan/dvb-s/Eurobird9-9.0E
@@ -0,0 +1,16 @@
+# Eurobird 9.0E
+# freq pol sr fec
+S 11727000 V 27500000 5/6
+S 11747000 H 27500000 3/4
+S 11766000 V 27500000 5/6
+S 11785000 H 27500000 3/4
+S 11804000 V 27500000 3/4
+S 11823000 H 27500000 3/4
+S 11843000 V 27500000 3/4
+S 11881000 V 26700000 3/4
+S 11919000 V 27500000 5/6
+S 11938000 H 27500000 3/4
+S 11977000 H 27500000 3/4
+S 11996000 V 27500000 3/4
+S 12054000 H 27500000 3/4
+S 12092000 H 27500000 3/4
diff --git a/util/scan/dvb-s/Turksat-42.0E b/util/scan/dvb-s/Turksat-42.0E
index 2364673..a30d24f 100644
--- a/util/scan/dvb-s/Turksat-42.0E
+++ b/util/scan/dvb-s/Turksat-42.0E
@@ -1,5 +1,104 @@
 # Turksat 42.0E
 # freq pol sr fec
-S 11594000 H 4557000 5/6
-S 10978000 V 2344000 3/4
+S 10968000 V 4557000 3/4
+S 10970000 H 30000000 5/6
+S 10999000 V 2222000 3/4
+S 11003000 V 2175000 3/4
+S 11007000 V 2950000 5/6
+S 11011000 V 2125000 5/6
+S 11014000 V 2050000 3/4
+S 11018000 V 2150000 3/4
+S 11028000 V 2400000 3/4
+S 11083000 V 8888000 3/4
+S 11136000 V 2170000 3/4
+S 11143000 V 2200000 3/4
+S 11159000 V 2596000 3/4
+S 11162000 V 2222000 5/6
+S 11166000 V 2960000 3/4
+S 11177000 V 2200000 3/4
+S 11554000 H 2916000 2/3
+S 11576000 H 2400000 5/6
+S 11581000 H 4444000 3/4
+S 11607000 H 3750000 2/3
+S 11712000 V 2963000 3/4
+S 11716000 V 2222000 3/4
+S 11729000 V 15555000 5/6
 S 11734000 H 3291000 3/4
+S 11739000 H 3125000 3/4
+S 11743000 H 2222000 3/4
+S 11743000 V 2222000 3/4
+S 11748000 H 4444000 5/6
+S 11753000 H 3000000 7/8
+S 11754000 V 3900000 5/6
+S 11758000 V 2962000 3/4
+S 11760000 H 5925000 3/4
+S 11762000 V 2155000 3/4
+S 11765000 V 2222000 3/4
+S 11770000 V 2177000 3/4
+S 11773000 V 2420000 5/6
+S 11775000 H 2222000 3/4
+S 11777000 V 3150000 5/6
+S 11781000 V 2815000 5/6
+S 11794000 H 5632000 3/4
+S 11800000 H 2400000 5/6
+S 11804000 V 24444000 5/6
+S 11830000 V 6666000 3/4
+S 11839000 V 4444000 3/4
+S 11846000 V 3333000 5/6
+S 11852000 V 4444000 5/6
+S 11858000 V 2400000 7/8
+S 11867000 V 4444000 5/6
+S 11874000 V 3400000 7/8
+S 11878000 V 3750000 5/6
+S 11882000 V 2965000 5/6
+S 11887000 V 3333000 7/8
+S 11892000 H 12800000 5/6
+S 11892000 V 2960000 5/6
+S 11896000 V 2222000 3/4
+S 11905000 H 6666000 3/4
+S 11912000 H 3333000 5/6
+S 11919000 V 24444000 3/4
+S 11951000 V 8800000 5/6
+S 11959000 V 2960000 3/4
+S 11963000 V 2300000 5/6
+S 11967000 V 4340000 3/4
+S 11970000 H 17900000 5/6
+S 11973000 V 2240000 5/6
+S 11984000 H 4000000 5/6
+S 11996000 V 26000000 5/6
+S 12002000 H 4800000 5/6
+S 12008000 H 4400000 5/6
+S 12015000 H 4800000 5/6
+S 12022000 H 5380000 5/6
+S 12028000 H 4557000 5/6
+S 12126000 V 6666000 5/6
+S 12127000 H 7400000 5/6
+S 12140000 H 2222000 3/4
+S 12140000 V 4444000 3/4
+S 12513000 H 4400000 3/4
+S 12518000 H 3125000 3/4
+S 12524000 H 4250000 5/6
+S 12530000 H 4444000 5/6
+S 12536000 H 2962000 3/4
+S 12540000 H 3125000 3/4
+S 12563000 H 24000000 7/8
+S 12590000 V 3000000 5/6
+S 12595000 V 2500000 5/6
+S 12605000 V 2961000 3/4
+S 12609000 V 3700000 5/6
+S 12614000 V 3333000 5/6
+S 12633000 V 4800000 5/6
+S 12636000 H 4800000 5/6
+S 12638000 V 2400000 5/6
+S 12647000 V 3333000 5/6
+S 12652000 H 22500000 5/6
+S 12652000 V 3900000 5/6
+S 12660000 V 9150000 5/6
+S 12672000 H 2222000 5/6
+S 12680000 H 8888000 3/4
+S 12692000 H 2800000 5/6
+S 12696000 H 2222000 3/4
+S 12699000 H 2400000 3/4
+S 12702000 H 2285000 7/8
+S 12717000 V 5925000 5/6
+S 12731000 V 3333000 3/4
diff --git a/util/scan/dvb-t/fi-Kuhmoinen b/util/scan/dvb-t/ad-Andorra
similarity index 56%
copy from util/scan/dvb-t/fi-Kuhmoinen
copy to util/scan/dvb-t/ad-Andorra
index da26764..7c63c82 100644
--- a/util/scan/dvb-t/fi-Kuhmoinen
+++ b/util/scan/dvb-t/ad-Andorra
@@ -1,5 +1,6 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
+# DVB-T Andorra
 # 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 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 666000000 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/at-Offical b/util/scan/dvb-t/at-Official
similarity index 79%
rename from util/scan/dvb-t/at-Offical
rename to util/scan/dvb-t/at-Official
index 4a9caf8..cdb221c 100644
--- a/util/scan/dvb-t/at-Offical
+++ b/util/scan/dvb-t/at-Official
@@ -1,5 +1,5 @@
 # Austria, all DVB-T transmitters run by ORS
-# Created from http://www.ors.at/view/ors.php?mid=29
+# Created from http://www.ors.at/view08/ors.php?mid=94
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 474000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 490000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
@@ -11,15 +11,14 @@ T 538000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 546000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 554000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 562000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 578000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 578000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE
-T 586000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 594000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 602000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 626000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 610000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 634000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 650000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
+T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 698000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 722000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
 T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 802000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 858000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/au-Cairns b/util/scan/dvb-t/au-Cairns
index d9c6208..430045d 100644
--- a/util/scan/dvb-t/au-Cairns
+++ b/util/scan/dvb-t/au-Cairns
@@ -1,12 +1,12 @@
 # Australia / Cairns (Mt Bellenden-Ker transmitters)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # ABC VHF 8
-T 191500000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 191500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SEVEN VHF 11
 T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # WIN VHF 12
-T 226500000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # TEN VHF 6 (Expected Start Date Dec 2006)
-T 177500000 7MHz 3/4 1/2 QAM64 8k 1/16 NONE
+T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SBS UHF 29
-T 536500000 7MHz 2/3 2/3 QAM64 8k 1/8 NONE
+T 536500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-Canberra-Black-Mt b/util/scan/dvb-t/au-Canberra-Black-Mt
index a675100..bdaa33c 100644
--- a/util/scan/dvb-t/au-Canberra-Black-Mt
+++ b/util/scan/dvb-t/au-Canberra-Black-Mt
@@ -1,12 +1,12 @@
 # Australia / Canberra / Black Mt
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # ABC
-T 205500000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 205500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # Prime
 T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # WIN
 T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # Ten
-T 177500000 7MHz 3/4 1/2 QAM64 8k 1/16 NONE
+T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SBS
 T 543500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-Coonabarabran b/util/scan/dvb-t/au-Coonabarabran
new file mode 100644
index 0000000..8596ba5
--- /dev/null
+++ b/util/scan/dvb-t/au-Coonabarabran
@@ -0,0 +1,16 @@
+# Australia / Coonabarabran
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# ABC VHF12
+T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# TEN UHF46
+T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Nine UHF45
+T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Seven VHF11
+#T 618250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# SBS UHF44
+T 641500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# D44 UHF35
+#T 578500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/au-Hobart b/util/scan/dvb-t/au-Hobart
index 0dac4aa..b2b60e8 100644
--- a/util/scan/dvb-t/au-Hobart
+++ b/util/scan/dvb-t/au-Hobart
@@ -1,12 +1,12 @@
 # Australia / Tasmania / Hobart
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # ABC VHF 8
-T 191625000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 191500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SBS VHF 9a
-T 205500000 7MHz 2/3 2/3 QAM64 8k 1/8 NONE
+T 205500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
 # SCT VHF 10
-T 212500000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 212500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # WIN VHF 7
-T 184500000 7MHz 3/4 3/4 QAM64 8k 1/8 NONE
+T 184625000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
 # TDT VHF 11
-T 219500000 7MHz 3/4 3/4 QAM64 8k 1/8 NONE
+T 219500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-SunshineCoast b/util/scan/dvb-t/au-SunshineCoast
old mode 100755
new mode 100644
index 32e72e0..9fb17ef
--- a/util/scan/dvb-t/au-SunshineCoast
+++ b/util/scan/dvb-t/au-SunshineCoast
@@ -1,12 +1,12 @@
 # Australia / Sunshine Coast
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS
-T 585500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# ABC
-T 767500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 788500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
-# Nine
+# SBS36 SBS ***
+T 585625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# TNQ47 10 ***
+T 662625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# ABQ62 ABC ***
+T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# STQ65 7 ***
+T 788625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# STQ68 WIN ***
 T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 662625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/au-canberra b/util/scan/dvb-t/au-canberra
index 18c0fda..792844d 100644
--- a/util/scan/dvb-t/au-canberra
+++ b/util/scan/dvb-t/au-canberra
@@ -1,12 +1,12 @@
 # Australia / Canberra / Woden
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # ABC
-T 205625000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # Seven
 T 177500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
 # Nine
 T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # Ten
-T 219500000 7MHz 3/4 1/2 QAM64 8k 1/16 NONE
+T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SBS
 T 543500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/be-Brussels b/util/scan/dvb-t/be-Brussels
new file mode 100644
index 0000000..f81b83b
--- /dev/null
+++ b/util/scan/dvb-t/be-Brussels
@@ -0,0 +1,5 @@
+# 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 2/3 NONE QAM64 8k 1/32 NONE # RTBF
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # BE-TV
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # VRT
diff --git a/util/scan/dvb-t/ch-All b/util/scan/dvb-t/ch-All
index f3f23c3..a471e5e 100644
--- a/util/scan/dvb-t/ch-All
+++ b/util/scan/dvb-t/ch-All
@@ -1,19 +1,19 @@
 # Switzerland, whole country
 # Created from http://www.broadcast.ch/portal.aspx?pid=705
+# and http://www.broadcast.ch/data_program_dvbt.aspx
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 514000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 522000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 538000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 554000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 562000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 578000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 594000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 602000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 618000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 626000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 642000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 658000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
+T 658000000 8MHz 5/6 NONE QAM16 8k 1/8 NONE
 T 666000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 674000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 682000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
@@ -21,9 +21,11 @@ T 690000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 698000000 8MHz 5/6 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
 T 738000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 754000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 762000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 786000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 802000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
 T 826000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
+T 850000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/ch-Citycable b/util/scan/dvb-t/ch-Citycable
index 3de688e..1b9ed6c 100644
--- a/util/scan/dvb-t/ch-Citycable
+++ b/util/scan/dvb-t/ch-Citycable
@@ -1,14 +1,18 @@
 # Lausanne - Switzerland (DVB-T on CityCable cable network)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 522000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 554000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 570000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 578000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 586000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 610000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 618000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 626000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 658000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 730000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
-T 746000000 8MHz 7/8 7/8 QAM64 8k 1/32 NONE
+T 498000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 522000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 554000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 570000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 578000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 586000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 610000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 618000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 626000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 658000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 730000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 746000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 818000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 826000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 834000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
+T 842000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/cz-Brno b/util/scan/dvb-t/cz-Brno
index 9bc07f9..b82e108 100644
--- a/util/scan/dvb-t/cz-Brno
+++ b/util/scan/dvb-t/cz-Brno
@@ -1,4 +1,10 @@
 # DVB-T Brno (Brno, Czech Republic)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# CRa - Ceske radiokomunikace, TX Barvicova/Hady
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# MUX 1 Ceska televize
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# MUX 2 Ceske radiokomunikace
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# MUX 3 Czech Digital Group
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# MUX 4 Telefonica O2
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/cz-Klet b/util/scan/dvb-t/cz-Klet
new file mode 100644
index 0000000..880db35
--- /dev/null
+++ b/util/scan/dvb-t/cz-Klet
@@ -0,0 +1,4 @@
+# DVB-T Ceske Budejovice (Klet, Czech Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# CRa - Ceske radiokomunikace, TX Klet
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/cz-Plzen b/util/scan/dvb-t/cz-Plzen
new file mode 100644
index 0000000..0b916af
--- /dev/null
+++ b/util/scan/dvb-t/cz-Plzen
@@ -0,0 +1,8 @@
+# DVB-T Plzen (Pilsen, Czech Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# MUX 1 Ceska televize
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# MUX 2 Ceske Radiokomunikace
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+# MUX 3 Czech Digital Group
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/cz-Praha b/util/scan/dvb-t/cz-Praha
index d12a8cf..0d6721f 100644
--- a/util/scan/dvb-t/cz-Praha
+++ b/util/scan/dvb-t/cz-Praha
@@ -1,5 +1,7 @@
 # DVB-T Praha (Prague, Czech Republic)
 # 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 674000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/de-Aachen_Stadt b/util/scan/dvb-t/de-Aachen_Stadt
deleted file mode 100644
index d076b08..0000000
--- a/util/scan/dvb-t/de-Aachen_Stadt
+++ /dev/null
@@ -1,6 +0,0 @@
-# DVB-T Aachen-Stadt
-# info from http://www.nrw.ueberallfernsehen.de/fileadmin/downloads/2007-09-14_Programmbelegung_Aachen.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # ZDF
-T 602000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # WDR AC
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # ARD NRW
diff --git a/util/scan/dvb-t/de-Baden-Wuerttemberg b/util/scan/dvb-t/de-Baden-Wuerttemberg
new file mode 100644
index 0000000..3e5bec2
--- /dev/null
+++ b/util/scan/dvb-t/de-Baden-Wuerttemberg
@@ -0,0 +1,20 @@
+# 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 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsPlus
+T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFdokukanal, 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 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, arte, Phoenix, EinsPlus
+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: Das Erste, arte, Phoenix, EinsPlus
+                                            # CH50: SWR-BW, BR, hr, WDR
+T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Das Erste, arte, Phoenix, EinsPlus
+T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: Das Erste, arte, Phoenix, EinsPlus
+                                            # CH53: SWR-BW, BR, hr, WDR
+T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: 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-Bayern b/util/scan/dvb-t/de-Bayern
new file mode 100644
index 0000000..50229fd
--- /dev/null
+++ b/util/scan/dvb-t/de-Bayern
@@ -0,0 +1,40 @@
+# 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 184500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE # CH06: Das Erste, arte, Phoenix, EinsPlus
+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 / ZDFdokukanal, ZDFinfokanal
+T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: BR, BRalpha, SWR, Das Erste
+                                            # CH25: ZDF, 3sat, KiKa / ZDFdokukanal, 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 / ZDFdokukanal, ZDFinfokanal
+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 / ZDFdokukanal, ZDFinfokanal
+T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: RTL, RTL II, Super RTL, VOX
+                                            # CH34: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Das Erste, arte, Phoenix, EinsPlus
+T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: BR, BRalpha, hr, mdr
+                                            # CH40: Das Erste, arte, Phoenix, EinsPlus
+T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ZDF, 3sat, KiKa / ZDFdokukanal, 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
+                                            # CH47: Das Erste, arte, Phoenix, EinsPlus
+T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: Pro7, Sat.1, Kabel1, N24
+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 / ZDFdokukanal, ZDFinfokanal
+T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: http://www.digitalfernsehen.de/news/news_769785.html
+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 770000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH58: Das Erste, arte, Phoenix, EinsPlus
+T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, Eurosport, MonA, Franken Fernsehen
+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 c975008..86f875b 100644
--- a/util/scan/dvb-t/de-Berlin
+++ b/util/scan/dvb-t/de-Berlin
@@ -1,11 +1,11 @@
 # 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     # K5  WDR, SW, BBC, FAB
-T 191500000 7MHz 2/3 NONE QAM16 8k 1/8 NONE     # K7  MDR, arte, NDR, ARD-Online-Kanal, ARD-MHP-Data
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE     # K25 RTL, RTL2, Super RTL, VOX
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE     # K27 ARD, RBB, RBB Brd., Phoenix, EinsExtra, ARD-MHP-Data
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # K33 ZDF, 3sat, Doku/KiKa
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE     # K44 Sat1, N24, Pro7, Kabel1
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE     # K56 Eurosport, DSF, 9Live, TV.Berlin
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE     # K59 n-tv, Euronews, 33x Radio
-T 618000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE     # DVBH Test INT/Service
+T 177500000 7MHz 3/4 NONE QAM16 8k 1/8 NONE # CH05: HSE 24/MONA, FAB, WDR, SWR
+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 / ZDFdokukanal, ZDFinfokanal
+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, + 26 Radioprogramme
diff --git a/util/scan/dvb-t/de-Bielefeld b/util/scan/dvb-t/de-Bielefeld
deleted file mode 100644
index ee12dfe..0000000
--- a/util/scan/dvb-t/de-Bielefeld
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Ostwestfalen
-# http://www.nrw.ueberallfernsehen.de/fileadmin/downloads/DVB-T_P3.1_OWL.pdf
-
-# 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 554000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-Brandenburg b/util/scan/dvb-t/de-Brandenburg
new file mode 100644
index 0000000..3949267
--- /dev/null
+++ b/util/scan/dvb-t/de-Brandenburg
@@ -0,0 +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 / ZDFdokukanal, ZDFinfokanal
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+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-Braunschweig b/util/scan/dvb-t/de-Braunschweig
deleted file mode 100644
index 8dd39e2..0000000
--- a/util/scan/dvb-t/de-Braunschweig
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Braunschweig -- info from http://www.skyplus.seyen.de/DVB-T.html
-T 198500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-Bremen b/util/scan/dvb-t/de-Bremen
index bc05505..7540bbf 100644
--- a/util/scan/dvb-t/de-Bremen
+++ b/util/scan/dvb-t/de-Bremen
@@ -1,9 +1,9 @@
-# DVB-T Bremen/Unterweser
+# DVB-T Bremen
+# 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 AUTO QAM16 8k 1/4 NONE
-T 538000000 8MHz 2/3 1/2 QAM16 8k 1/4 NONE
-T 562000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
-T 642000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
-T 666000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
-T 698000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
-T 746000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
+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 / ZDFdokukanal, 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, MONA/DMAX
+T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Pro7, Sat.1, Kabel1, N24
diff --git a/util/scan/dvb-t/de-Brocken_Magdeburg b/util/scan/dvb-t/de-Brocken_Magdeburg
deleted file mode 100644
index e17988b..0000000
--- a/util/scan/dvb-t/de-Brocken_Magdeburg
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Brocken/Magdeburg (Germany)
-# Generated by Tobias Stoeber <mail at tobias-stoeber.de>
-# info from: http://www.dvbt-mitteldeutschland.de/index.php?content=Programme&menu=Technische&region=MD
-
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: ARD Das Erste, EinsFestival, arte, Phoenix (TSMB/MDR1.1)
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: 3sat, ZDFDoku/KIKA, ZDF, ZDFInfo (ZDF)
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH34: MDR S-ANHALT, rbb Brandenburg, WDR Koeln, NDR FS NDS (TSMB/MDR2.2)
diff --git a/util/scan/dvb-t/de-Chemnitz b/util/scan/dvb-t/de-Chemnitz
deleted file mode 100644
index c5ea0f8..0000000
--- a/util/scan/dvb-t/de-Chemnitz
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Chemnitz
-# T freq bw fec_hi fec lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # ard, arte, phoenix, einsfest
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # zdf, 3sat, zdf-doku,/kika
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # mdr, rbb, wdr, br
diff --git a/util/scan/dvb-t/de-Dresden b/util/scan/dvb-t/de-Dresden
deleted file mode 100644
index 2945846..0000000
--- a/util/scan/dvb-t/de-Dresden
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Dresden
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Kanal 29, mdr, rbb, wdr, br
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 36, zdf, 3sat, kika, none
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Kanal 39, ard, arte, phoenix, 1festival
diff --git a/util/scan/dvb-t/de-Erfurt-Weimar b/util/scan/dvb-t/de-Erfurt-Weimar
deleted file mode 100644
index f266ac6..0000000
--- a/util/scan/dvb-t/de-Erfurt-Weimar
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Erfurt-Weimar
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 21, ARD, arte, Phoenix, Eins festival
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # Kanal 27, MDR Thüringen, rbb, WDR, hr
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # Kanal 50, ZDF, ZDF info / 3sat, KiKA / ZDF doku, MHP
diff --git a/util/scan/dvb-t/de-Frankfurt b/util/scan/dvb-t/de-Frankfurt
deleted file mode 100644
index 5dc3418..0000000
--- a/util/scan/dvb-t/de-Frankfurt
+++ /dev/null
@@ -1,41 +0,0 @@
-###########################################
-# DVB-T, Deutschland, Rhein-Main Gebiet
-###########################################
-
-# Start der Ausstrahlung: ARD Multiplex 2 und ZDF Multiplex ab 04.10.2004.
-# ARD Multiplex 1 sowie Private Multiplex 1 bis 3 am 06.12.2004.
-
-# ARD Multiplex 2 Kanal 57 wurde am 03.12.2007 auf Kanal 37 verschoben
-
-# Alle DVB-T Sender im Rhein-Main Gebiet senden vertikal polarisiert
-
-# Sender auf dem grossen Feldberg und FFM-Fernmeldeturm sind Rundstrahler,
-# Hohe Wurzel ist Richtstrahler
-
-# Kanaele 5 bis 10 liegen im "VHF"-Band, 21 bis 69 im "UHF"-Band, d.h.,
-# nur ARD Multiplex 1 wird im VHF-Band gesendet.
-
-# Nettodatenrate 13.06 MBit/s fuer ARD Multiplex 1, 13.27 MBit/s fuer alle anderen
-
-
-##################################################################################
-#T  freq    bw   coderate_HP coderate_LP modulation transmode guard-int hierarchy
-#--------------------------------------------------------------------------------
-
-# Kanal 8, ARD Multiplex 1, Grosser Feldberg 10kW, Hohe Wurzel 20kW, FFM-Turm 10kW
-T 198500000 7MHz 2/3         NONE        QAM16      8k        1/4       NONE
-
-# Kanal 22, ZDF Multiplex, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
-T 482000000 8MHz 2/3         NONE        QAM16      8k        1/4       NONE
-
-# Kanal 34, Private Multiplex 1, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
-T 578000000 8MHz 2/3         NONE        QAM16      8k        1/4       NONE
-
-# Kanal 37, ARD Multiplex 2, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
-T 602000000 8MHz 2/3         NONE        QAM16      8k        1/4       NONE
-
-# Kanal 54, Private Multiplex 2, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
-T 738000000 8MHz 2/3         NONE        QAM16      8k        1/4       NONE
-
-# Kanal 64, Private Multiplex 3, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
-T 818000000 8MHz 2/3         NONE        QAM16      8k        1/4       NONE
diff --git a/util/scan/dvb-t/de-Freiburg b/util/scan/dvb-t/de-Freiburg
deleted file mode 100644
index 5066a21..0000000
--- a/util/scan/dvb-t/de-Freiburg
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Freiburg M/V
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-HalleSaale b/util/scan/dvb-t/de-HalleSaale
deleted file mode 100644
index 19b94e7..0000000
--- a/util/scan/dvb-t/de-HalleSaale
+++ /dev/null
@@ -1,6 +0,0 @@
-# DVB-T Halle/Saale (Germany)
-# Generated by Albrecht Lohoefener <albrechtloh at gmx.de> http://www.albrechtloh.de
-
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH1:ZDF CH2:ZDFinfo/3sat CH3:ZDFDoku/KiKa
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH1:BR CH2:MDR CH3:rbb CH4:NDR
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH1:arte CH2:Phoenix CH3:EinsFestival CH4:ARD
diff --git a/util/scan/dvb-t/de-Hamburg b/util/scan/dvb-t/de-Hamburg
index a3658e5..4588748 100644
--- a/util/scan/dvb-t/de-Hamburg
+++ b/util/scan/dvb-t/de-Hamburg
@@ -1,15 +1,16 @@
 # 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 205500000 7MHz 3/4 NONE QAM16 8k 1/8 NONE     # CH09: NDR, WDR, MDR, Bayrisches Fernsehen
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # CH23: ZDF, Info/3sat, Doku/KiKa
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 514000000 8MHz 3/4 AUTO QAM16 8k 1/4 NONE     #ARD, MDR S-Anhalt, NDR MV, NDR SH, rbb Berlin
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # CH30: Sat.1, N24, ProSieben, KABEL1
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # CH33: Das Erste Hamburg, Eins Extra, arte, Phoenix
-T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # CH40: RTL Television, RTL2, Super RTL, VOX
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # CH53: HH1, Eurosport, Terra Nova, Neun Live
-T 738000000 8MHz 3/4 AUTO QAM16 8k 1/4 NONE     #ZDF, Doku/KiKa, Info/3sat
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # CH56: NDR, MDR, WDR, hr
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH23: ZDF, 3sat, KiKa / ZDFdokukanal, 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 546000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH30: Pro7, Sat.1, Kabel1, N24
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/8 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 626000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH40: RTL, RTL II, Super RTL, VOX
+T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Neun live, HH1, BibelTV, Eurosport
+T 674000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH46: Neun live, HH1, BibelTV, 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 738000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH54: NDR HH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR SH
diff --git a/util/scan/dvb-t/de-Hannover b/util/scan/dvb-t/de-Hannover
deleted file mode 100644
index af838a0..0000000
--- a/util/scan/dvb-t/de-Hannover
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Hannover -- info from http://www.skyplus.seyen.de/DVB-T.html
-T 198500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-Hessen b/util/scan/dvb-t/de-Hessen
new file mode 100644
index 0000000..7aa5d02
--- /dev/null
+++ b/util/scan/dvb-t/de-Hessen
@@ -0,0 +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 / ZDFdokukanal, ZDFinfokanal
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFdokukanal, 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 / ZDFdokukanal, 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 / ZDFdokukanal, 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 / ZDFdokukanal, 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
diff --git a/util/scan/dvb-t/de-Kassel b/util/scan/dvb-t/de-Kassel
deleted file mode 100644
index 09958ab..0000000
--- a/util/scan/dvb-t/de-Kassel
+++ /dev/null
@@ -1,31 +0,0 @@
-# DVB-T, Germany, Nordhessen, Region Kassel
-###########################################
-
-# broadcasting started 29.06.2006
-
-# broadcasting on 3 frequencies: 562KHz, 642KHz, 746KHz
-
-# broacasting stations: Hoher Meissner, Habichtswald
-
-# available programs:-------------
-# ARD
-# ZDF
-# arte/EinsFestival
-# 3sat
-# HR
-# NDR
-# MDR
-# WDR
-# Phoenix
-# Doku/KiKa
-
-##################################################################################
-
-# ARD, HR, arte/EinsFestival
-T 562000000 8MHz 3/4         NONE        QAM16      8k        1/4       NONE
-
-# ZDF, 3sat, Doku/KiKa
-T 642000000 8MHz 2/3         NONE        QAM16      8k        1/4       NONE
-
-# Phoenix, NDR, MDR, WDR
-T 746000000 8MHz 3/4         NONE        QAM16      8k        1/4       NONE
diff --git a/util/scan/dvb-t/de-Kiel b/util/scan/dvb-t/de-Kiel
deleted file mode 100644
index da13fb4..0000000
--- a/util/scan/dvb-t/de-Kiel
+++ /dev/null
@@ -1,8 +0,0 @@
-# DVB-T Kiel
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 21, ZDF, ZDFInfokanal/3Sat, KI.KA/ ZDFdokukanal, MHP: ZDFdigitext
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 35, Kabel 1, N24, ProSieben, SAT.1 Fernsehen
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 39, NDR, WDR, mdr, Bayerisches Fernsehen
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 45, RTL Television, RTL II, Super RTL, VOX
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 47, ARD, Phoenix, arte, Eins Extra
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 57, EuroSport, 9Live, TELE 5
diff --git a/util/scan/dvb-t/de-Koeln-Bonn b/util/scan/dvb-t/de-Koeln-Bonn
deleted file mode 100644
index 78aa56a..0000000
--- a/util/scan/dvb-t/de-Koeln-Bonn
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T NRW/Bonn
-# 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
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 826000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-Leipzig b/util/scan/dvb-t/de-Leipzig
deleted file mode 100644
index 870ae15..0000000
--- a/util/scan/dvb-t/de-Leipzig
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Leipzig (Germany)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 205500000 7MHz 2/3 NONE QAM64 8k 1/16 NONE # mdr rbb wdr brs
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE  # zdf kika 3sat
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE  # ard einsfestival arte phoenix
diff --git a/util/scan/dvb-t/de-Loerrach b/util/scan/dvb-t/de-Loerrach
deleted file mode 100644
index 705a71f..0000000
--- a/util/scan/dvb-t/de-Loerrach
+++ /dev/null
@@ -1,19 +0,0 @@
-# DVB-T transmitter of Lörrach - Germany
-# signal DVB-T transmis depuis l'émetteur de Lörrach - Allemagne
-#
-# 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
-
-# Chaînes allemandes
-
-# ch 33 : 3sat, Doku/KiKa, ZDF, ZDFinfokanal
-T 570000000 8MHz AUTO NONE QAM16 8k AUTO NONE
-
-# ch 39 : SWR Fernsehen BW, hr-fernsehen, WDR Fernsehen et Bayerisches FS
-T 618000000 8MHz AUTO NONE QAM16 8k AUTO NONE
-
-# ch 52 : Das Erste, arte (Allemagne), Phoenix et EinsPlus
-T 722000000 8MHz AUTO NONE QAM16 8k AUTO NONE
diff --git a/util/scan/dvb-t/de-Luebeck b/util/scan/dvb-t/de-Luebeck
deleted file mode 100644
index 5779502..0000000
--- a/util/scan/dvb-t/de-Luebeck
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Lübeck
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 530000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 546000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
-T 570000000 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/de-Mecklenburg-Vorpommern b/util/scan/dvb-t/de-Mecklenburg-Vorpommern
new file mode 100644
index 0000000..d1b0800
--- /dev/null
+++ b/util/scan/dvb-t/de-Mecklenburg-Vorpommern
@@ -0,0 +1,12 @@
+# DVB-T Mecklenburg-Vorpommern
+# 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 / ZDFdokukanal, ZDFinfokanal
+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 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 714000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH51: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
diff --git a/util/scan/dvb-t/de-Muenchen b/util/scan/dvb-t/de-Muenchen
deleted file mode 100644
index 9fee24b..0000000
--- a/util/scan/dvb-t/de-Muenchen
+++ /dev/null
@@ -1,10 +0,0 @@
-# DVB-T Muenchen/Bayern
-# by Christoph Anton Mitterer (cam at mathematica.scientia.net)
-# http://christoph.anton.mitterer.name/
-
-T 212500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-Niedersachsen b/util/scan/dvb-t/de-Niedersachsen
new file mode 100644
index 0000000..7066933
--- /dev/null
+++ b/util/scan/dvb-t/de-Niedersachsen
@@ -0,0 +1,40 @@
+# DVB-T Niedersachsen
+# 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: 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 / ZDFdokukanal, ZDFinfokanal
+T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: RTL, RTL II, Super RTL, VOX
+                                            # CH24: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Tele 5, NICK/Comedy Central, Eurosport, MONA/DMAX
+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 / ZDFdokukanal, 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 / ZDFdokukanal, ZDFinfokanal
+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 / ZDFdokukanal, 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 / ZDFdokukanal, ZDFinfokanal
+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 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 714000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH51: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
+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 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 / ZDFdokukanal, ZDFinfokanal
+T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, Comedy Central, Eurosport, MONA/DMAX
+                                            # 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
diff --git a/util/scan/dvb-t/de-Nordrhein-Westfalen b/util/scan/dvb-t/de-Nordrhein-Westfalen
new file mode 100644
index 0000000..4541df7
--- /dev/null
+++ b/util/scan/dvb-t/de-Nordrhein-Westfalen
@@ -0,0 +1,27 @@
+# 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 / ZDFdokukanal, ZDFinfokanal
+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 / ZDFdokukanal, ZDFinfokanal
+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 / ZDFdokukanal, ZDFinfokanal
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: CNN, Eurosport, Tele5, 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 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 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 / ZDFdokukanal, 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-Nuernberg b/util/scan/dvb-t/de-Nuernberg
deleted file mode 100644
index 39eb56f..0000000
--- a/util/scan/dvb-t/de-Nuernberg
+++ /dev/null
@@ -1,8 +0,0 @@
-# DVB-T Nuernberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 184500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE     # ard
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # zdf
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # prosieben
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # br
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # franken
-T 834000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE     # rtl
diff --git a/util/scan/dvb-t/de-Osnabrueck b/util/scan/dvb-t/de-Osnabrueck
deleted file mode 100644
index 9bbb58e..0000000
--- a/util/scan/dvb-t/de-Osnabrueck
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Osnabrueck/Lingen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 AUTO QAM16 8k 1/4 NONE
-T 778000000 8MHz 2/3 AUTO QAM16 8k 1/4 NONE
-T 602000000 8MHz 2/3 AUTO QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-Ostbayern b/util/scan/dvb-t/de-Ostbayern
deleted file mode 100644
index 2c5bdf5..0000000
--- a/util/scan/dvb-t/de-Ostbayern
+++ /dev/null
@@ -1,11 +0,0 @@
-# DVB-T Ostbayern/Bayern
-# for the Region around Regensburg, Straubing, Cham, Zwiesel, Freyung, Passau, Pfarrkirchen
-# Thorsten Pinz (tom_p at gmx.de)
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 191500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE #K07, ARD (Hohe Linie, Hoher Bogen, Brotjackelriegel)
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #K27, BR (Pfarrkirchen, Brotjackelriegel)
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #K28, BR (Hohe Linie, Hoher Bogen)
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #K33, ZDF (Hoher Bogen, Brotjackelriegel, Pfarrkirchen)
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #K40, ARD (Pfarrkirchen)
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #K53, ZDF (Hohe Linie)
diff --git a/util/scan/dvb-t/de-Ravensburg b/util/scan/dvb-t/de-Ravensburg
deleted file mode 100644
index 9482448..0000000
--- a/util/scan/dvb-t/de-Ravensburg
+++ /dev/null
@@ -1,8 +0,0 @@
-# DVB-T Ravensburg/Bodensee
-# T freq bw fec_hi fec_lo mod transmission-mode guard-i
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-Rheinland-Pfalz b/util/scan/dvb-t/de-Rheinland-Pfalz
new file mode 100644
index 0000000..bf57d4d
--- /dev/null
+++ b/util/scan/dvb-t/de-Rheinland-Pfalz
@@ -0,0 +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 / ZDFdokukanal, ZDFinfokanal
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFdokukanal, 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 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 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-Rostock b/util/scan/dvb-t/de-Rostock
deleted file mode 100644
index 8e2dc75..0000000
--- a/util/scan/dvb-t/de-Rostock
+++ /dev/null
@@ -1,4 +0,0 @@
-# DVB-T Rostock
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 1/2 QAM16 8k 1/4 NONE # ARD / NDR
-T 674000000 8MHz 2/3 1/2 QAM16 8k 1/4 NONE # ZDF
diff --git a/util/scan/dvb-t/de-Ruhrgebiet b/util/scan/dvb-t/de-Ruhrgebiet
deleted file mode 100644
index 0f3821c..0000000
--- a/util/scan/dvb-t/de-Ruhrgebiet
+++ /dev/null
@@ -1,19 +0,0 @@
-# DVB-T Düsseldorf/Ruhrgebiet
-#  Not everyone in this area will be able to tune on the last
-#  3 frequencies, as they are not broadcasted in the whole area.
-#  See http://nrw.ueberallfernsehen.de/fileadmin/images/programmbelegung_ddrf.gif
-#  for details on regional availability.
-#
-#  Updated to the new settings, I do not know how long this file has not been updatet,
-#  but now it's done and I hope everyone will now be able to recieve ARD, arte, Phoenix
-#  and Eins-Festival out of the box now.
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Düsseldorf, Wesel, Essen, Langenberg, Dortmund
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Düsseldorf, Wesel, Essen, Langenberg, Dortmund
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Düsseldorf, Wesel, Essen, Langenberg, Dortmund
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Düsseldorf, Wesel, Essen, Langenberg, Dortmund
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Düsseldorf, Wesel, Essen, Langenberg, Dortmund, Kleve
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # Langenberg, Dortmund
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Düsseldorf, Wesel, Langenberg
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # Essen, Gelsenkirchen, Scholven
diff --git a/util/scan/dvb-t/de-Saarland b/util/scan/dvb-t/de-Saarland
new file mode 100644
index 0000000..330075b
--- /dev/null
+++ b/util/scan/dvb-t/de-Saarland
@@ -0,0 +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 / ZDFdokukanal, ZDFinfokanal
+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 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: SaarTV, Tele 5, QVC, BibelTV
diff --git a/util/scan/dvb-t/de-Sachsen b/util/scan/dvb-t/de-Sachsen
new file mode 100644
index 0000000..42e01eb
--- /dev/null
+++ b/util/scan/dvb-t/de-Sachsen
@@ -0,0 +1,12 @@
+# 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 / ZDFdokukanal, ZDFinfokanal
+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 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 / ZDFdokukanal, ZDFinfokanal
+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
new file mode 100644
index 0000000..ee59498
--- /dev/null
+++ b/util/scan/dvb-t/de-Sachsen-Anhalt
@@ -0,0 +1,12 @@
+# 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 / ZDFdokukanal, ZDFinfokanal
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH24: Das Erste, arte, Phoenix, EinsFestival
+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 / ZDFdokukanal, ZDFinfokanal
+T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+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
diff --git a/util/scan/dvb-t/de-Schleswig-Holstein b/util/scan/dvb-t/de-Schleswig-Holstein
new file mode 100644
index 0000000..7b544d6
--- /dev/null
+++ b/util/scan/dvb-t/de-Schleswig-Holstein
@@ -0,0 +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 / ZDFdokukanal, ZDFinfokanal
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR HH
+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 / ZDFdokukanal, 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: 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 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, MONA/DMAX
+T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Neun live, Tele 5, Eurosport, MONA/DMAX
+T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsExtra
diff --git a/util/scan/dvb-t/de-Schwerin b/util/scan/dvb-t/de-Schwerin
deleted file mode 100644
index 9f0ffd8..0000000
--- a/util/scan/dvb-t/de-Schwerin
+++ /dev/null
@@ -1,4 +0,0 @@
-# DVB-T Schwerin M/V
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 3/4 AUTO QAM16 8k 1/4 NONE #ARD, MDR S-Anhalt, NDR MV, NDR SH, rbb Berlin
-T 738000000 8MHz 3/4 AUTO QAM16 8k 1/4 NONE #ZDF, Doku/KiKa, Info/3sat
diff --git a/util/scan/dvb-t/de-Stuttgart b/util/scan/dvb-t/de-Stuttgart
deleted file mode 100644
index ea2676b..0000000
--- a/util/scan/dvb-t/de-Stuttgart
+++ /dev/null
@@ -1,6 +0,0 @@
-# DVB-T Stuttgart
-# by Joerg Marhenke (joerg.marhenke at uni-ulm.de)
-
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/de-Thueringen b/util/scan/dvb-t/de-Thueringen
new file mode 100644
index 0000000..c159ea4
--- /dev/null
+++ b/util/scan/dvb-t/de-Thueringen
@@ -0,0 +1,10 @@
+# DVB-T Thüringen
+# 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 / ZDFdokukanal, ZDFinfokanal
+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 / ZDFdokukanal, ZDFinfokanal
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH53: Das Erste, arte, Phoenix, EinsFestival
diff --git a/util/scan/dvb-t/de-Wuerzburg b/util/scan/dvb-t/de-Wuerzburg
deleted file mode 100644
index ff7e77b..0000000
--- a/util/scan/dvb-t/de-Wuerzburg
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Wuerzburg/Bayern
-#Thorsten Becker (thorsten.becker at cloupage.de)
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 212500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE #K10, ARD
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #K25, ZDF
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #K45, BR
diff --git a/util/scan/dvb-t/dk-All b/util/scan/dvb-t/dk-All
index 135c043..61b71be 100644
--- a/util/scan/dvb-t/dk-All
+++ b/util/scan/dvb-t/dk-All
@@ -1,5 +1,6 @@
 # Denmark, whole country
 # 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
diff --git a/util/scan/dvb-t/es-Albacete b/util/scan/dvb-t/es-Albacete
index ea67c6f..419156b 100644
--- a/util/scan/dvb-t/es-Albacete
+++ b/util/scan/dvb-t/es-Albacete
@@ -1,8 +1,8 @@
 # Spain, Albacete
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 59: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 63: CLMTV
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 59: 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: CLMTV
+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
diff --git a/util/scan/dvb-t/es-Alicante b/util/scan/dvb-t/es-Alicante
index a804b38..c8b5620 100644
--- a/util/scan/dvb-t/es-Alicante
+++ b/util/scan/dvb-t/es-Alicante
@@ -1,9 +1,9 @@
 # DVB-T Alicante, Spain
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 55: TV3, K33/33, 3/24, Canal 300
-T 770000000 8MHz 2/3 1/2 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 1/2 QAM64 8k 1/4 NONE     # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 55: TV3, K33/33, 3/24, Canal 300
+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
diff --git a/util/scan/dvb-t/es-Alpicat b/util/scan/dvb-t/es-Alpicat
index ffdf7a3..fe4f726 100644
--- a/util/scan/dvb-t/es-Alpicat
+++ b/util/scan/dvb-t/es-Alpicat
@@ -1,8 +1,8 @@
 # DVB-T Alpicat (Lleida)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c58: TV3, K3/33, 3/24, 300, 3i
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c64: TVE1, TVE2, Teledeporte, C24h
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c67: Cuatro, 40Latino, CNN+, LaSexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c58: TV3, K3/33, 3/24, 300, 3i
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c64: TVE1, TVE2, Teledeporte, C24h
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c67: Cuatro, 40Latino, CNN+, LaSexta 1
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
diff --git a/util/scan/dvb-t/es-Bilbao b/util/scan/dvb-t/es-Bilbao
index 6d1b18a..8331363 100644
--- a/util/scan/dvb-t/es-Bilbao
+++ b/util/scan/dvb-t/es-Bilbao
@@ -1,6 +1,6 @@
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 67: CNN+. Cuatro, La Sexta, 40 latino TV
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 69: Antena 3, La Sexta 2, Neo, Nova, Telehit, Onda Cero, Europa FM, Onda Melodia
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 63: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 794000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 61: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gastea, Radio EITB
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 67: CNN+. Cuatro, La Sexta, 40 latino TV
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 69: Antena 3, La Sexta 2, Neo, Nova, Telehit, Onda Cero, Europa FM, Onda Melodia
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 63: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 66: Veo, Veo 2, Net TV, Teledeporte
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 61: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gastea, Radio EITB
diff --git a/util/scan/dvb-t/es-Cadiz b/util/scan/dvb-t/es-Cadiz
new file mode 100644
index 0000000..68ace6b
--- /dev/null
+++ b/util/scan/dvb-t/es-Cadiz
@@ -0,0 +1,8 @@
+# DVB-T Cadiz (Andalucia)                      by terrex  Feb 2009
+# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C59
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE                  # C64
+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-Carceres b/util/scan/dvb-t/es-Carceres
index 6755954..3d3f77c 100644
--- a/util/scan/dvb-t/es-Carceres
+++ b/util/scan/dvb-t/es-Carceres
@@ -1,10 +1,10 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
-T 770000000 8MHz 2/3 1/2 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 1/2 QAM64 8k 1/4 NONE     # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
-T 794000000 8Mhz 2/3 1/2 QAM64 8K 1/4 NONE     # Canal 61: Canal Extremadura, Extremadura Television
+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
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 61: Canal Extremadura, Extremadura Television
diff --git a/util/scan/dvb-t/es-Donostia b/util/scan/dvb-t/es-Donostia
index 7ea5f50..b8f233a 100644
--- a/util/scan/dvb-t/es-Donostia
+++ b/util/scan/dvb-t/es-Donostia
@@ -1,14 +1,14 @@
 # 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 1/2 QAM64 8k 1/4 NONE     # Canal 32: CNN+, Cuatro, La Sexta 1, 40 Latino TV, EPG Soge V2 5
-T 626000000 8MHz 2/3 1/2 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 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 1/2 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 1/2 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 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 1/2 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 1/2 QAM64 8k 1/4 NONE     # Canal 68: Fly Music, Tele 5, Tele 5 Estrellas, Tele 5 Sport
+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
diff --git a/util/scan/dvb-t/es-Las_Palmas b/util/scan/dvb-t/es-Las_Palmas
index 0475937..c68abe3 100644
--- a/util/scan/dvb-t/es-Las_Palmas
+++ b/util/scan/dvb-t/es-Las_Palmas
@@ -1,8 +1,8 @@
 # Funciona correctamente en Las Palmas de Gran Canaria (24-4-2007)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 60: TVE1, TVE2, 24H TVE, Clan/TVE, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
+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 1/2 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 1/2 QAM64 8k 1/4 NONE     # Canal 67: CNN+, Cuatro, La Sexta 1, 40 Latino TV, EPG Soge V2 5
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 68: Fly Music, Punto Radio, Tele 5, Tele 5 Estrellas, Tele 5 Sport
-T 858000000 8MHz 2/3 1/2 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 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
diff --git a/util/scan/dvb-t/es-Madrid b/util/scan/dvb-t/es-Madrid
index 5834bd1..650436a 100644
--- a/util/scan/dvb-t/es-Madrid
+++ b/util/scan/dvb-t/es-Madrid
@@ -1,8 +1,8 @@
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
-T 770000000 8MHz 2/3 1/2 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 1/2 QAM64 8k 1/4 NONE     # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+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
diff --git a/util/scan/dvb-t/es-Malaga b/util/scan/dvb-t/es-Malaga
index 7da1610..290e186 100644
--- a/util/scan/dvb-t/es-Malaga
+++ b/util/scan/dvb-t/es-Malaga
@@ -1,9 +1,9 @@
 # DVB-T Malaga (Andalucia)                   by Pedro Leon 4 Mayo 2007
 # T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE	# C57 La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE	# C63 Canal Sur, Canal 2 Andalucia
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE	# C66 TELEDEPORTE, VEO, *Canal Ingenieria, SETenVEO, Tienda en VEO, NET TV, Radio Intereconomia
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE	# C67 CUATRO, CNN+, 40 LATINO, laSexta
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE	# C68 Telecinco, T5 Estrellas, T5 Sport, FLYMUSIC, PUNTO RADIO
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE	# C69 ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, *tvtv DIGITAL, ONDA CERO, EUROPA FM, ONDA MELODIA, Telehit
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C57 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 # C63 Canal Sur, Canal 2 Andalucia
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66 TELEDEPORTE, VEO, *Canal Ingenieria, SETenVEO, Tienda en VEO, NET TV, Radio Intereconomia
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67 CUATRO, CNN+, 40 LATINO, laSexta
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68 Telecinco, T5 Estrellas, T5 Sport, FLYMUSIC, PUNTO RADIO
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69 ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, *tvtv DIGITAL, ONDA CERO, EUROPA FM, ONDA MELODIA, Telehit
 # * Canales de datos o MHT
diff --git a/util/scan/dvb-t/es-Mussara b/util/scan/dvb-t/es-Mussara
index 9feb073..a5147b4 100644
--- a/util/scan/dvb-t/es-Mussara
+++ b/util/scan/dvb-t/es-Mussara
@@ -1,8 +1,8 @@
 # DVB-T La Mussara (Reus-Tarragona)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c59: TV3, K3/33, 3/24, 300, 3i
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c64: TVE1, TVE2, Teledeporte, C24h
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c67: Cuatro, 40Latino, CNN+, LaSexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE	# c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c59: TV3, K3/33, 3/24, 300, 3i
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c64: TVE1, TVE2, Teledeporte, C24h
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c67: Cuatro, 40Latino, CNN+, LaSexta 1
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
diff --git a/util/scan/dvb-t/es-Santander b/util/scan/dvb-t/es-Santander
index 94326d4..214badb 100644
--- a/util/scan/dvb-t/es-Santander
+++ b/util/scan/dvb-t/es-Santander
@@ -1,7 +1,7 @@
 # file automatically generated by w_scan
 # (http://wirbel.htpc-forum.de/w_scan/index2.html)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 2/3 QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 842000000 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-Valencia b/util/scan/dvb-t/es-Valencia
new file mode 100644
index 0000000..91614d0
--- /dev/null
+++ b/util/scan/dvb-t/es-Valencia
@@ -0,0 +1,9 @@
+# DVB-T Valencia, Spain
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 23: TMV, Tele 7, Aprende ingles TV, Ed. Prensa Val.,R.Mediamed
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 55: TV3, 33, 3/24, K3/300
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 57: Canal 9, Punt 2, Popular TV, LP Teva, Radio 9, Si Radio
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 58: TVE 1, La 2, 24H TVE, Clan TVE, RNE 1, RNE C, RNE 3
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 66: Veo, Sony TV en Veo, Tienda en Veo, Intereconomia, Teledeporte, R. Interec., R. Marca
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 67: Cuatro, CNN+, 40 Latino, Promo, La Sexta, Ser, 40 Princ., Cad. Dial
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 68: Telecinco, Telecinco 2, FDF, Cinco Shop, Disney Channel, Punto Radio
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 69: Antena 3, Antena Neox, Antena Nova, Hogar 10, Onda Cero, Europa FM, Onda Melodia
diff --git a/util/scan/dvb-t/es-Valladolid b/util/scan/dvb-t/es-Valladolid
index 25cb74a..961554b 100644
--- a/util/scan/dvb-t/es-Valladolid
+++ b/util/scan/dvb-t/es-Valladolid
@@ -1,7 +1,7 @@
 # DVB-T Valladolid
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 57: Clan TVE, 24H TVE, La 2, TVE 1, RNE1, RNE3, RNC
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE     # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 57: Clan TVE, 24H TVE, La 2, TVE 1, RNE1, RNE3, RNC
+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
diff --git a/util/scan/dvb-t/es-Zaragoza b/util/scan/dvb-t/es-Zaragoza
index 95588b6..b9a3c90 100644
--- a/util/scan/dvb-t/es-Zaragoza
+++ b/util/scan/dvb-t/es-Zaragoza
@@ -1,7 +1,7 @@
 # DVB-T Zaragoza (Aragón) [Spain] [es-Zaragoza]
 # Generated by Víctor Martínez Romanos <vmromanos at gmail.com>
-T 794000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE       # Canal 63: TVE 1, TVE 2, 24H, CLAN/50, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE       # Canal 66: TELEDEPORTE, VEO TV, VEO 2, NET TV
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE       # Canal 67: CUATRO, CNN+, 40 LATINO, LA SEXTA 1
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE       # Canal 68: T5 ESTRELLAS, T5 SPORT, TELECINCO, FLYMUSIC
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE       # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE      # Canal 63: TVE 1, TVE 2, 24H, CLAN/50, RNE1, RNEC, RNE3
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE      # Canal 66: TELEDEPORTE, VEO TV, VEO 2, NET TV
+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: T5 ESTRELLAS, T5 SPORT, TELECINCO, FLYMUSIC
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE      # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
diff --git a/util/scan/dvb-t/fi-Salla_Ihistysjanka b/util/scan/dvb-t/fi-Inari_Janispaa
similarity index 63%
copy from util/scan/dvb-t/fi-Salla_Ihistysjanka
copy to util/scan/dvb-t/fi-Inari_Janispaa
index 8466760..78957e4 100644
--- a/util/scan/dvb-t/fi-Salla_Ihistysjanka
+++ b/util/scan/dvb-t/fi-Inari_Janispaa
@@ -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 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Salla_Saija b/util/scan/dvb-t/fi-Inari_Naatamo
similarity index 81%
rename from util/scan/dvb-t/fi-Salla_Saija
rename to util/scan/dvb-t/fi-Inari_Naatamo
index 817b1d4..d4f2158 100644
--- a/util/scan/dvb-t/fi-Salla_Saija
+++ b/util/scan/dvb-t/fi-Inari_Naatamo
@@ -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 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 522000000 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-Nurmes_Porokyla b/util/scan/dvb-t/fi-Kuhmo_Tikkasenmaki
similarity index 81%
copy from util/scan/dvb-t/fi-Nurmes_Porokyla
copy to util/scan/dvb-t/fi-Kuhmo_Tikkasenmaki
index 0585576..9dbe779 100644
--- a/util/scan/dvb-t/fi-Nurmes_Porokyla
+++ b/util/scan/dvb-t/fi-Kuhmo_Tikkasenmaki
@@ -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 562000000 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
diff --git a/util/scan/dvb-t/fi-Kuhmoinen b/util/scan/dvb-t/fi-Kuhmoinen
index da26764..f1afd7a 100644
--- a/util/scan/dvb-t/fi-Kuhmoinen
+++ b/util/scan/dvb-t/fi-Kuhmoinen
@@ -2,4 +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 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 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-Salla_Ihistysjanka b/util/scan/dvb-t/fi-Kuusamo_Hamppulampi
similarity index 81%
copy from util/scan/dvb-t/fi-Salla_Ihistysjanka
copy to util/scan/dvb-t/fi-Kuusamo_Hamppulampi
index 8466760..4109350 100644
--- a/util/scan/dvb-t/fi-Salla_Ihistysjanka
+++ b/util/scan/dvb-t/fi-Kuusamo_Hamppulampi
@@ -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 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 658000000 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-Nurmes_Porokyla b/util/scan/dvb-t/fi-Nurmes_Kortevaara
similarity index 100%
rename from util/scan/dvb-t/fi-Nurmes_Porokyla
rename to util/scan/dvb-t/fi-Nurmes_Kortevaara
diff --git a/util/scan/dvb-t/fi-Parikkala b/util/scan/dvb-t/fi-Parikkala
index 3ae4451..7b87891 100644
--- a/util/scan/dvb-t/fi-Parikkala
+++ b/util/scan/dvb-t/fi-Parikkala
@@ -2,3 +2,4 @@
 # 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 626000000 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 34be33d..1825663 100644
--- a/util/scan/dvb-t/fi-Rautjarvi_Simpele
+++ b/util/scan/dvb-t/fi-Rautjarvi_Simpele
@@ -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 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 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-Salla_Ihistysjanka b/util/scan/dvb-t/fi-Salla_Ihistysjanka
index 8466760..42276ad 100644
--- a/util/scan/dvb-t/fi-Salla_Ihistysjanka
+++ b/util/scan/dvb-t/fi-Salla_Ihistysjanka
@@ -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 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 602000000 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-Salla_Ihistysjanka b/util/scan/dvb-t/fi-Salla_Sarivaara
similarity index 81%
copy from util/scan/dvb-t/fi-Salla_Ihistysjanka
copy to util/scan/dvb-t/fi-Salla_Sarivaara
index 8466760..a6d3546 100644
--- a/util/scan/dvb-t/fi-Salla_Ihistysjanka
+++ b/util/scan/dvb-t/fi-Salla_Sarivaara
@@ -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 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 610000000 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-Salo_Isokyla b/util/scan/dvb-t/fi-Salo_Isokyla
index 95320d3..9a8e7c5 100644
--- a/util/scan/dvb-t/fi-Salo_Isokyla
+++ b/util/scan/dvb-t/fi-Salo_Isokyla
@@ -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 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 514000000 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 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Sipoo_Galthagen b/util/scan/dvb-t/fi-Sipoo_Norrkulla
similarity index 100%
rename from util/scan/dvb-t/fi-Sipoo_Galthagen
rename to util/scan/dvb-t/fi-Sipoo_Norrkulla
diff --git a/util/scan/dvb-t/fi-Salla_Ihistysjanka b/util/scan/dvb-t/fi-Suomussalmi_Myllylahti
similarity index 63%
copy from util/scan/dvb-t/fi-Salla_Ihistysjanka
copy to util/scan/dvb-t/fi-Suomussalmi_Myllylahti
index 8466760..8c80895 100644
--- a/util/scan/dvb-t/fi-Salla_Ihistysjanka
+++ b/util/scan/dvb-t/fi-Suomussalmi_Myllylahti
@@ -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 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/fi-Salla_Ihistysjanka b/util/scan/dvb-t/fi-Utsjoki_Nuvvus
similarity index 63%
copy from util/scan/dvb-t/fi-Salla_Ihistysjanka
copy to util/scan/dvb-t/fi-Utsjoki_Nuvvus
index 8466760..c6028c4 100644
--- a/util/scan/dvb-t/fi-Salla_Ihistysjanka
+++ b/util/scan/dvb-t/fi-Utsjoki_Nuvvus
@@ -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 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 546000000 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/fr-Cluses b/util/scan/dvb-t/fr-Cluses
index e40863c..95d52ea 100644
--- a/util/scan/dvb-t/fr-Cluses
+++ b/util/scan/dvb-t/fr-Cluses
@@ -1,5 +1,5 @@
-# Cluses - France (DVB-T transmitter of Cluses ( Nondéfini ) )
-# Cluses - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
+# 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
@@ -12,19 +12,12 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 #### Cluses - Nondéfini ####
 #R1
-#T FREQ1 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 490000000 8MHz AUTO NONE QAM64 8k AUTO NONE
 #R2
-#T FREQ2 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 514000000 8MHz AUTO NONE QAM64 8k AUTO NONE
 #R3
-#T FREQ3 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 538000000 8MHz AUTO NONE QAM64 8k AUTO NONE
 #R4
-#T FREQ4 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 586000000 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 Cluses n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
+T 618000000 8MHz AUTO NONE QAM64 8k AUTO NONE
diff --git a/util/scan/dvb-t/fr-Dijon b/util/scan/dvb-t/fr-Dijon
index a077ad1..f9f288b 100644
--- a/util/scan/dvb-t/fr-Dijon
+++ b/util/scan/dvb-t/fr-Dijon
@@ -1,5 +1,5 @@
-# Dijon - France (DVB-T transmitter of Dijon ( Nondéfini ) )
-# Dijon - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
+# 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
@@ -9,22 +9,20 @@
 # ou a l'auteur du fichier :
 # Nicolas Estre <n_estre at yahoo.fr>
 #
+# Fichier mis à jour par Maxence Antonczyk <maxantz at yahoo.fr>
+# le Dimanche 7 Septembre 2008, à 13h00
+#
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#### Dijon - 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
+#### 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 FREQ5 8MHz AUTO NONE QAM64 8k AUTO NONE
-#R6
-#T FREQ6 8MHz AUTO NONE QAM64 8k AUTO NONE
-##############################################################
-# en Avril 2006, l'emetteur pour Dijon n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
+#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-Lyon-Fourviere b/util/scan/dvb-t/fr-Lyon-Fourviere
index 17ca1f7..8ee9145 100644
--- a/util/scan/dvb-t/fr-Lyon-Fourviere
+++ b/util/scan/dvb-t/fr-Lyon-Fourviere
@@ -3,8 +3,7 @@
 # see : http://tnt.niv2.com/69000-LYON.html
 # contact : Nicolas Estre <n_estre at yahoo.fr>
 
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval
-hierarchy
+# 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
diff --git a/util/scan/dvb-t/fr-Montbeliard b/util/scan/dvb-t/fr-Montbeliard
new file mode 100644
index 0000000..0bd9252
--- /dev/null
+++ b/util/scan/dvb-t/fr-Montbeliard
@@ -0,0 +1,18 @@
+# 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-Paris b/util/scan/dvb-t/fr-Paris
index bfb93a8..61a7e8d 100644
--- a/util/scan/dvb-t/fr-Paris
+++ b/util/scan/dvb-t/fr-Paris
@@ -11,7 +11,7 @@ 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 2/3 NONE QAM64 8k 1/32 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
diff --git a/util/scan/dvb-t/fr-Strasbourg b/util/scan/dvb-t/fr-Strasbourg
index dbbf546..2c189de 100644
--- a/util/scan/dvb-t/fr-Strasbourg
+++ b/util/scan/dvb-t/fr-Strasbourg
@@ -1,30 +1,18 @@
-# Strasbourg - France (DVB-T transmitter of Strasbourg ( Nondéfini ) )
-# Strasbourg - France (signal DVB-T transmis depuis l'émetteur de Nondéfini )
+# Strasbourg - France (DVB-T transmitter of Strasbourg (Nordheim))
+# contributed by Benjamin Zores <ben at geexbox.org>
 #
-# 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 at linuxtv.org (depot des fichiers d'init dvb)
-# ou a l'auteur du fichier :
-# Nicolas Estre <n_estre at yahoo.fr>
+# 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
-#### Strasbourg - 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 Strasbourg n'etait pas defini
-#  Vous devez donc modifier les frequences manuellement.
-# SVP Renvoyez le fichier mis a jour aux contacts ci-dessus.
-##############################################################
+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/hk-HongKong b/util/scan/dvb-t/hk-HongKong
new file mode 100644
index 0000000..4c332ff
--- /dev/null
+++ b/util/scan/dvb-t/hk-HongKong
@@ -0,0 +1,18 @@
+# Hong Kong (DMB-TH)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# TVB (band 35)
+T 586000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+# ATV (band 37)
+T 602000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+
+# Simulcast (band 22)
+T 482000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+# Simulcast (band 30)
+T 546000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+# Simulcast (band 32)
+T 562000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+# Simulcast (band 40)
+T 628000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
+# Simulcast (band 43)
+T 650000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Aosta b/util/scan/dvb-t/it-Aosta
index 486407d..28c32ae 100644
--- a/util/scan/dvb-t/it-Aosta
+++ b/util/scan/dvb-t/it-Aosta
@@ -8,14 +8,14 @@
 #  inviare una maila kaffeine-user at lists.sf.net per aggiornare/correggere questo file...
 #
 # MUX-A RAI
-T 226500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 226500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 1
-T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MBONE
-T 746000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 2
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # TIMB1
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Bari b/util/scan/dvb-t/it-Bari
index 5be8ac4..efcc852 100644
--- a/util/scan/dvb-t/it-Bari
+++ b/util/scan/dvb-t/it-Bari
@@ -1,18 +1,18 @@
 # Italy, Bari
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX-A RAI
-T 219500000 7MHz 2/3 AUTO QAM64 8k 1/32 NONE
+T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
-T 546000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 1
-T 514000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE
-T 226500000 7MHz 2/3 AUTO QAM64 8k 1/32 NONE
+T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 2
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MBONE
-T 498000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # TIMB1
-T 530000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # TeleNorba, TelePuglia, altro...
-T 794000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Bologna b/util/scan/dvb-t/it-Bologna
index dcd8e35..8f5a136 100644
--- a/util/scan/dvb-t/it-Bologna
+++ b/util/scan/dvb-t/it-Bologna
@@ -1,28 +1,28 @@
 # DVB-T Collserola (Barcelona)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 #TeleSanterno
-T 186000000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
 #RaiA
-T 203500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 203500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
 #Sestarete / Rete 7
-T 212500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 212500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
 #Modena
-T 219500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
 #ReteA, Camera e Senato
-T 594000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #Sestarete / Rete 7
-T 610000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #DFree
-T 634000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #Mediaset Mux-B
-T 698000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #La7
-T 714000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #RaiB
-T 722000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #Mediaset Mux-A
-T 794000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #TeleSanterno
-T 802000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #LA7-2
-T 842000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Bolzano b/util/scan/dvb-t/it-Bolzano
index de50c1e..f4a8e9b 100644
--- a/util/scan/dvb-t/it-Bolzano
+++ b/util/scan/dvb-t/it-Bolzano
@@ -2,4 +2,4 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
 #RAS DVB-t  NETWORK
-T 698000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
+T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/util/scan/dvb-t/it-Cagliari b/util/scan/dvb-t/it-Cagliari
index 9dcaf53..2cfb4c1 100644
--- a/util/scan/dvb-t/it-Cagliari
+++ b/util/scan/dvb-t/it-Cagliari
@@ -1,31 +1,23 @@
 # DVB-T Cagliari
-# MUX DFREE
-T 730000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# MUX LA7/MTV
-T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# MUX MEDIASET1
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# MUX MEDIASET2
-T 562000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# MUX-A RAI
-T 546000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# TCS
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# VIDEOLINA
-T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# TIMEDIA MUX A
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# TIMEDIA MUX B
-T 177500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# T 177500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# SUPER TV
-# T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 205500000 7MHz 3/4 NONE QAM64 8k 1/32 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 514000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 562000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 674000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 762000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Caivano b/util/scan/dvb-t/it-Caivano
index c823a6f..86a9847 100644
--- a/util/scan/dvb-t/it-Caivano
+++ b/util/scan/dvb-t/it-Caivano
@@ -1,14 +1,17 @@
-#################################
-# DVB-T Caivano(NA) 80023 Italy #
-# update: 25/05/2007            #
-# by Nicola Costanzo            #
-#################################
-
-# MUX LA7/MTV
-T 834000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+# DVB-T Caivano (Naples) 80023
+# 30/10/2008 by Nicola Costanzo
+# 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
+# MUX DFREE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 1
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 2
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX LA7/MTV
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# TIMB1
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-A RAI
-T 722000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Catania b/util/scan/dvb-t/it-Catania
index c4d0849..20bacd6 100644
--- a/util/scan/dvb-t/it-Catania
+++ b/util/scan/dvb-t/it-Catania
@@ -2,26 +2,26 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
 # MUX DFREE (Canale 5,Italia1,SportItalia,LCI,RadioItalia Tv)
-T 810000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 690000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 618000000	 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 810000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 690000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 618000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX LA7/MTV (La 7,MTV ITALIA,Canale D,Music Box)
-#T 586000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+#T 586000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
-T 586000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 586000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX MEDIASET 1
-T 226500000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 834000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 226500000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 834000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX MEDIASET 2
-T 818000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 650000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 650000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX-A RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 610000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 482000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 482000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Conero b/util/scan/dvb-t/it-Conero
index 318775f..2d48138 100644
--- a/util/scan/dvb-t/it-Conero
+++ b/util/scan/dvb-t/it-Conero
@@ -1,8 +1,8 @@
 # Italia / Conero (it-Conero) -- mailto: simon <f.simon at email.it>
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # C50
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # C46
-T 674000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # C21
-T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Firenze b/util/scan/dvb-t/it-Firenze
index 2ebe9e6..eca721a 100644
--- a/util/scan/dvb-t/it-Firenze
+++ b/util/scan/dvb-t/it-Firenze
@@ -1,20 +1,20 @@
 # This channel list is made by Michele Ficarra
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX-A RAI
-T 554000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 1
-T 682000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 2
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX La7/MTV
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE
-T 738000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MBON
-T 778000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX Digitoscana
-T 219500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX Tele37
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Genova b/util/scan/dvb-t/it-Genova
index 5b5c670..5a1b6dd 100644
--- a/util/scan/dvb-t/it-Genova
+++ b/util/scan/dvb-t/it-Genova
@@ -1,12 +1,12 @@
 # Italia / Genova (it-Genova) - Angelo Conforti <angeloxx at angeloxx.it>
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX-A RAI
-T 498000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
-T 219500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX La7/MTV
-T 682000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX Mediaset
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Livorno b/util/scan/dvb-t/it-Livorno
index bf83a4a..075d8b4 100644
--- a/util/scan/dvb-t/it-Livorno
+++ b/util/scan/dvb-t/it-Livorno
@@ -2,14 +2,14 @@
 # Thanks to: Alessandro Guarguaglini, Stefano Lenzi
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX-A RAI
-T 698000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 1
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 2
-T 754000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX La7/MTV
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE
-T 586000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Milano b/util/scan/dvb-t/it-Milano
index 2b70cd1..5854044 100644
--- a/util/scan/dvb-t/it-Milano
+++ b/util/scan/dvb-t/it-Milano
@@ -1,15 +1,15 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX-A RAI
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
-T 482000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-A MEDIASET
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-A MEDIASET-2
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX La7/MTV
-T 506000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE 2
-T 538000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Palermo b/util/scan/dvb-t/it-Palermo
index 8043acd..e375565 100644
--- a/util/scan/dvb-t/it-Palermo
+++ b/util/scan/dvb-t/it-Palermo
@@ -2,22 +2,22 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
 # MUX DFREE (Canale 5,Italia1,SportItalia,LCI,RadioItalia Tv)
-T 754000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 602000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 850000000	 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 754000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 602000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 850000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX LA7/MTV (La 7,MTV ITALIA,Canale D,Music Box)
-#T 730000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+#T 730000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
-T 842000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX MEDIASET 2
-T 682000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 650000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 682000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 650000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX-A RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 610000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
 
 # MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 482000000      8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 482000000      8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Pescara b/util/scan/dvb-t/it-Pescara
new file mode 100644
index 0000000..1c89646
--- /dev/null
+++ b/util/scan/dvb-t/it-Pescara
@@ -0,0 +1,15 @@
+# Italy, Pescara San Silvestro
+# Antonio de Vincentiis, www.devincentiis.it, Montesilvano (PE)
+# update 06.02.2009
+# MUX-A RAI canale: VHF-E polarizzazione: O
+T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX-B RAI canale: VHF-F polarizzazione: O
+T 194500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX MEDIASET 1 canale: UHF-69 polarizzazione: V
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX DFREE canale: UHF-56 polarizzazione: V
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MUX MEDIASET 2 canale: UHF-49 polarizzazione: V
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# MBONE canale: UHF-34 polarizzazione: V
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Pisa b/util/scan/dvb-t/it-Pisa
index 5990402..8723d99 100644
--- a/util/scan/dvb-t/it-Pisa
+++ b/util/scan/dvb-t/it-Pisa
@@ -2,17 +2,17 @@
 # Thanks to: Alessandro Guarguaglini, Stefano Lenzi
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX-A RAI
-T 698000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 1
-T 634000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE
-T 746000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 2
-T 754000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MBONE
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX TIMB1
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Roma b/util/scan/dvb-t/it-Roma
index 4463074..7e84900 100644
--- a/util/scan/dvb-t/it-Roma
+++ b/util/scan/dvb-t/it-Roma
@@ -1,16 +1,16 @@
 # DVB-T Roma
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX DFREE
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX La7/MTV
-T 730000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 1
-T 626000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET 2
-T 762000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-A RAI
-T 698000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
-T 186000000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
+T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
 # SUPER 3
-T 538000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-S-Stefano_al_mare b/util/scan/dvb-t/it-S-Stefano_al_mare
new file mode 100644
index 0000000..7dd0275
--- /dev/null
+++ b/util/scan/dvb-t/it-S-Stefano_al_mare
@@ -0,0 +1,19 @@
+#DVB Santo Stefano al mare (IM)
+#Aggiornato al 10/08/2008
+#Fonte: DGTVI.it
+#s-stefano at email.it
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#MUX-A RAI
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#MUX-B RAI
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#MUX MEDIASET 1
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#MUX MEDIASET 2
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#MUX MBONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#MUX DFREE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+#MUX TIMB 1
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Sassari b/util/scan/dvb-t/it-Sassari
index c81254e..23ba817 100644
--- a/util/scan/dvb-t/it-Sassari
+++ b/util/scan/dvb-t/it-Sassari
@@ -1,33 +1,33 @@
 # DVB-T Sassari Channels List by frippertronics at alice.it ;)
 # MUX DFREE
-T 746000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX LA7/MTV
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET1
-T 802000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX MEDIASET2
-T 634000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-A RAI
-T 786000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX-B RAI
-T 842000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 858000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MBONE
-T 738000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # TCS
-T 658000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # VIDEOLINA
-T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # TIMEDIA MUX A
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # TIMEDIA MUX B
-T 177500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-# T 177500000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 177500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# T 177500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # SUPER TV
-# T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+# T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Trieste b/util/scan/dvb-t/it-Trieste
index 1839cdf..0f92785 100644
--- a/util/scan/dvb-t/it-Trieste
+++ b/util/scan/dvb-t/it-Trieste
@@ -1,23 +1,23 @@
 # Trieste, Italy
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # MUX MEDIASET 1 (Class News, 24Ore TV, Coming soon, BBC World, Boing, Mediaset Premium)
-T 778000000 8MHz 2/3 1/1 QAM64 8k 1/32 NONE
-T 474000000 8MHz 2/3 1/1 QAM64 8k 1/32 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #
 # MUX-B RAI (Rai Doc-Futura, RaiSportSAT, RaiNotizie24, Rai EDU1, Sat2000, Radio1, Radio2, Radio3, FDAuditorium)
-T 682000000 8MHz 2/3 1/1 QAM64 8k 1/32 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #
 # MUX-A RAI (Rai Uno, Rai Due, Rai Tre, Rai Utile)
-T 602000000 8MHz 2/3 1/1 QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #
 # MUX DFREE (Rete 4, Italia 1, Sportitalia, LCI / Prima, Si Live24)
-T 754000000 8MHz 2/3 1/1 QAM64 8k 1/32 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #
 # MUX (All Music)
-T 666000000 8MHz 2/3 1/1 QAM64 8k 1/32 NONE
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #
 # MUX (Triveneta)
-T 698000000 8MHz 2/3 1/1 QAM64 8k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #
 # MUX (La7 Telemarket Retecapri MTv italia Sitcom Uno)
-T 674000000 8MHz 2/3 1/1 QAM64 8k 1/32 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Varese b/util/scan/dvb-t/it-Varese
index 045b56c..7ee9bb5 100644
--- a/util/scan/dvb-t/it-Varese
+++ b/util/scan/dvb-t/it-Varese
@@ -5,12 +5,12 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 #
 # MUX-A RAI  VHF H2 226,5 O CAMPO DEI FIORI
-T 226500000 7MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX DFREE UHF C50 706 V CAMPO DEI FIORI
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX LA7-MTV UHF C37 602 V CAMPO DEI FIORI
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX RTI UHF C26 514 O CAMPO DEI FIORI PRIMA CAPPELLA
-T 514000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # MUX RTI UHF C38 514 V CAMPO DEI FIORI ALBERGO
-T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Venezia b/util/scan/dvb-t/it-Venezia
index be454e4..af9f4a1 100644
--- a/util/scan/dvb-t/it-Venezia
+++ b/util/scan/dvb-t/it-Venezia
@@ -4,16 +4,16 @@
 # According to Eurosat 1/2006
 #
 # C50 - MediaSet
-T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # C37 - Rai A - Doesn't work in Mestre though
-T 602000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # C23 -Rai B
-T 490000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # C64 DFree
-T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # C65 La 7
-T 826000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # C58 Mediaset 2
-T 770000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 # C36 DFree
-T 594000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/it-Verona b/util/scan/dvb-t/it-Verona
new file mode 100644
index 0000000..b7df944
--- /dev/null
+++ b/util/scan/dvb-t/it-Verona
@@ -0,0 +1,19 @@
+# Italia / Verona / Sommacampagna - 02/03/2009
+# Italia / Verona / Zevio - 28/02/2009
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# C26 - TIMB1
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# C34 - Mux B Rai
+T 578000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# C41 - Mux  DFree
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# C54 - MBone
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# C58 - Rete All Music
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# C61 - Mux Mediaset 2
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# C64 - Mux DFree
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# C67 - Mediaset 1
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/lv-Riga b/util/scan/dvb-t/lv-Riga
index 0fb9b9a..98478e0 100644
--- a/util/scan/dvb-t/lv-Riga
+++ b/util/scan/dvb-t/lv-Riga
@@ -8,12 +8,12 @@
 T 610000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # Weak signal! Vājš signāls! Слабый сигнал!
 
 # Baltkom TV
-T 650000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
-T 658000000 8MHz 1/2 1/2 QPSK 8k 1/4 NONE
-T 666000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
-T 690000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
-T 834000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 658000000 8MHz 1/2 NONE QPSK 8k 1/4 NONE
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 834000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
 
 # WARNING!
 # Some applications detect incorrect guard-interval.
diff --git a/util/scan/dvb-t/nl-All b/util/scan/dvb-t/nl-All
index f01a086..f8b2c61 100644
--- a/util/scan/dvb-t/nl-All
+++ b/util/scan/dvb-t/nl-All
@@ -1,13 +1,14 @@
 # The Netherlands, whole country
-# Created from http://home.planet.nl/~ploe2070/fmtv/dvbt/digitenne-kpntv.html
+# Created from http://radio-tv-nederland.nl/TV%20zenderlijst%20Nederland.xls
+# and http://radio-tv-nederland.nl/dvbt/dvbt-lokaal.html
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 474000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 514000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
+T 538000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 546000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
@@ -17,12 +18,14 @@ T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 578000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 618000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 642000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 666000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 690000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 706000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 722000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 738000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
@@ -36,3 +39,4 @@ T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
 T 826000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 834000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
 T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 850000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/no-Trondelag_Stjordal b/util/scan/dvb-t/no-Trondelag_Stjordal
new file mode 100644
index 0000000..a9dc446
--- /dev/null
+++ b/util/scan/dvb-t/no-Trondelag_Stjordal
@@ -0,0 +1,7 @@
+# Norway / Trondelag / Stjordal
+# modified according to data automatically generated by w_scan
+# free (nrk) channels are on 658000000
+# 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 674000000 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/nz-Waiatarua b/util/scan/dvb-t/nz-Waiatarua
index 2fbea4f..d6c7dac 100644
--- a/util/scan/dvb-t/nz-Waiatarua
+++ b/util/scan/dvb-t/nz-Waiatarua
@@ -6,8 +6,8 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
 # Multiplex DA
-T 538000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 538000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
 # Multiplex DB
-T 570000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 570000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
 # Multiplex DC
-T 666000000 8MHz 3/4 3/4 QAM64 8k 1/16 NONE
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/pl-Rzeszow b/util/scan/dvb-t/pl-Rzeszow
new file mode 100644
index 0000000..561705e
--- /dev/null
+++ b/util/scan/dvb-t/pl-Rzeszow
@@ -0,0 +1,3 @@
+# Rzeszow / Sucha Gora, South-East Poland
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/pl-Warszawa b/util/scan/dvb-t/pl-Warszawa
new file mode 100644
index 0000000..64c0042
--- /dev/null
+++ b/util/scan/dvb-t/pl-Warszawa
@@ -0,0 +1,4 @@
+# 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
diff --git a/util/scan/dvb-t/se-Karlstad_Sormon b/util/scan/dvb-t/se-Karlstad_Sormon
index c9cb8e2..658bc70 100644
--- a/util/scan/dvb-t/se-Karlstad_Sormon
+++ b/util/scan/dvb-t/se-Karlstad_Sormon
@@ -2,8 +2,8 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # Channels
 # Mux3=30
-T 546000000 8MHz 2/3 1/2 QAM64 8k 1/8 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 # Mux4=42
-T 642000000 8MHz 2/3 1/2 QAM64 8k 1/8 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 # Mux1=43
-T 650000000 8MHz 2/3 1/2 QAM64 8k 1/8 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg b/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg
index 31d4886..a643955 100644
--- a/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg
+++ b/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg
@@ -1,7 +1,8 @@
 # Sweden - Södertälje/Ragnhildsborg
 # 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 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 546000000 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/linuxtv-dvb-apps.git



More information about the pkg-vdr-dvb-changes mailing list