Imported Upstream version 1.1.1+rev1355upstream/1.1.1+rev1355

author: etobi <git@e-tobi.net> 2013-09-03 09:48:45 +0200
committer: etobi <git@e-tobi.net> 2013-09-03 09:48:45 +0200
commit: 9fe4d4ea9c054e539ab679ed2e9c076c35beb69d (patch)
tree: affff927f15c8ae6c77890cc9564855efe2e51db /util/scan
parent: 9a5228e0f2b898367b7943d294be58caf6ce8bb3 (diff)
download: linux-dvb-apps-upstream/1.1.1+rev1355.tar.gz
125 files changed, 2141 insertions, 432 deletions
diff --git a/util/scan/dvb-c/at-Kabel-Braunau b/util/scan/dvb-c/at-Kabel-Braunau
new file mode 100644
index 0000000..1d93567
--- /dev/null
+++ b/util/scan/dvb-c/at-Kabel-Braunau
@@ -0,0 +1,26 @@
+# Kabel Braunau
+# freq sr fec mod
+C 386000000 6900000 NONE QAM64
+C 394000000 6875000 NONE QAM64
+C 402000000 6875000 NONE QAM64
+C 410000000 6875000 NONE QAM64
+C 418000000 6875000 NONE QAM64
+C 426000000 6875000 NONE QAM64
+C 434000000 6875000 NONE QAM64
+C 458000000 6875000 NONE QAM64
+C 466000000 6900000 NONE QAM64
+C 474000000 6900000 NONE QAM64
+C 482000000 6111000 NONE QAM64
+C 490000000 6111000 NONE QAM64
+C 498000000 6875000 NONE QAM64
+C 506000000 6111000 NONE QAM64
+C 514000000 6111000 NONE QAM64
+C 522000000 6428000 NONE QAM128
+C 530000000 6428000 NONE QAM128
+C 546000000 6875000 NONE QAM64
+C 554000000 6875000 NONE QAM64
+C 562000000 6875000 NONE QAM64
+C 570000000 6111000 NONE QAM64
+C 578000000 6900000 NONE QAM256
+C 586000000 6900000 NONE QAM256
+C 594000000 6875000 NONE QAM64
diff --git a/util/scan/dvb-c/at-Kabelsignal b/util/scan/dvb-c/at-Kabelsignal
new file mode 100644
index 0000000..4f7ec11
--- /dev/null
+++ b/util/scan/dvb-c/at-Kabelsignal
@@ -0,0 +1,38 @@
+# kabelsignal
+# freq sr fec mod
+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 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 QAM256
+C 450000000 6900000 NONE QAM256
+C 666000000 6900000 NONE QAM256
+C 674000000 6900000 NONE QAM256
+C 682000000 6900000 NONE QAM256
+C 690000000 6900000 NONE QAM256
+C 698000000 6900000 NONE QAM256
+C 706000000 6900000 NONE QAM256
+C 714000000 6900000 NONE QAM256
+C 722000000 6900000 NONE QAM256
+C 730000000 6900000 NONE QAM256
+C 738000000 6900000 NONE QAM256
+C 746000000 6900000 NONE QAM256
+C 762000000 6900000 NONE QAM256
+C 770000000 6900000 NONE QAM256
+C 778000000 6900000 NONE QAM256
+C 786000000 6900000 NONE QAM256
+C 794000000 6900000 NONE QAM256
+C 802000000 6900000 NONE QAM256
+C 810000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/at-KarrerNet b/util/scan/dvb-c/at-KarrerNet
index 27e143a..a00c6a2 100644
--- a/util/scan/dvb-c/at-KarrerNet
+++ b/util/scan/dvb-c/at-KarrerNet
@@ -1,18 +1,26 @@
 # 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 490000000 6900000 NONE QAM64
+C 498000000 6900000 NONE QAM64
+C 506000000 6900000 NONE QAM64
+C 514000000 6900000 NONE QAM64
 C 522000000 6900000 NONE QAM64
 C 530000000 6900000 NONE QAM64
 C 538000000 6900000 NONE QAM64
+C 546000000 6900000 NONE QAM64
+C 554000000 6900000 NONE QAM64
+C 562000000 6900000 NONE QAM64
+C 570000000 6900000 NONE QAM64
 C 578000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM256
+C 586000000 6900000 NONE QAM64
+C 610000000 6900000 NONE QAM64
+C 386000000 6900000 NONE QAM256
+C 394000000 6900000 NONE QAM256
 C 410000000 6900000 NONE QAM256
+C 434000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/hu-Digikabel b/util/scan/dvb-c/hu-Digikabel
new file mode 100644
index 0000000..c885bff
--- /dev/null
+++ b/util/scan/dvb-c/hu-Digikabel
@@ -0,0 +1,24 @@
+# Digikabel, Hungary
+# For the following cities:
+#  Budapest, Dorog, Hatvan, Kiskunhalas, Debrecen, Szekesfehervar, Pecs,
+#  Veszprem, Dunaujvaros, Miskolc, Gyongyos, Tatabanya, Varpalota, Nagykanizsa,
+#  Salgotarjan, Batonyterenye, Szolnok, Szentistvan, Nyiregyhaza, Gyor,
+#  Szazhalombatta, Bekescsaba, Bekes, Eger, Komlo, Oroszlany
+# In some of the cities not all the frequencies are available.
+# freq sr fec mod
+C 354000000 6900000 NONE QAM256
+C 362000000 6900000 NONE QAM256
+C 370000000 6900000 NONE QAM256
+C 378000000 6900000 NONE QAM256
+C 386000000 6900000 NONE QAM256
+C 394000000 6900000 NONE QAM256
+C 402000000 6900000 NONE QAM256
+C 410000000 6900000 NONE QAM256
+C 770000000 6900000 NONE QAM256
+C 778000000 6900000 NONE QAM256
+C 786000000 6900000 NONE QAM256
+C 794000000 6900000 NONE QAM256
+C 834000000 6900000 NONE QAM256
+C 842000000 6900000 NONE QAM256
+C 850000000 6900000 NONE QAM256
+C 858000000 6900000 NONE QAM256
diff --git a/util/scan/dvb-c/nl-Casema b/util/scan/dvb-c/nl-Casema
deleted file mode 100644
index 5c42d85..0000000
--- a/util/scan/dvb-c/nl-Casema
+++ /dev/null
@@ -1,3 +0,0 @@
-# Casema Netherlands
-# freq sr fec mod
-C 372000000 6875000 NONE QAM64
diff --git a/util/scan/dvb-c/nl-Ziggo b/util/scan/dvb-c/nl-Ziggo
new file mode 100644
index 0000000..037cca1
--- /dev/null
+++ b/util/scan/dvb-c/nl-Ziggo
@@ -0,0 +1,14 @@
+# Initial Tuning file for nl-Ziggo
+# This file only lists the main
+# frequencies. You still need to do
+# a network scan to find other
+# transponders.
+#
+# based on:
+# http://blob.ziggo.nl/dynamic/NL_HOME/PDF-UPLOAD/Gebruikers-Handleiding-DigitaleTV.pdf
+# Chapter 4
+#
+C 372000000 6875000 NONE QAM64 # Main Frequency Ziggo/Casema
+C 514000000 6875000 NONE QAM64 # Main Frequency Ziggo/Multikabel
+C 356000000 6875000 NONE QAM64 # Main Frequency Ziggo/@Home Zuid
+C 369000000 6875000 NONE QAM64 # Main Frequency Ziggo/@Home Noord
diff --git a/util/scan/dvb-c/nl-Ziggo-Zwolle b/util/scan/dvb-c/nl-Ziggo-Zwolle
new file mode 100644
index 0000000..e47b4ac
--- /dev/null
+++ b/util/scan/dvb-c/nl-Ziggo-Zwolle
@@ -0,0 +1,26 @@
+C 313000000 6875000 NONE QAM64 # TS   1
+C 361000000 6875000 NONE QAM64 # TS   2
+C 353000000 6875000 NONE QAM64 # TS   3
+C 345000000 6875000 NONE QAM64 # TS   4
+C 818000000 6875000 NONE QAM64 # TS   5
+C 329000000 6875000 NONE QAM64 # TS   6
+C 810000000 6875000 NONE QAM64 # TS   7
+C 305000000 6875000 NONE QAM64 # TS   8
+C 762000000 6875000 NONE QAM64 # TS   9
+C 618000000 6875000 NONE QAM64 # TS  10
+C 610000000 6875000 NONE QAM64 # TS  11
+C 337000000 6875000 NONE QAM64 # TS  12
+C 321000000 6875000 NONE QAM64 # TS  13
+C 385000000 6875000 NONE QAM64 # TS  14
+C 393000000 6875000 NONE QAM64 # TS  15
+C 401000000 6875000 NONE QAM64 # TS  16
+C 369000000 6875000 NONE QAM64 # TS  18 (main TS)
+C 297000000 6875000 NONE QAM64 # TS  19
+C 377000000 6875000 NONE QAM64 # TS  22
+C 754000000 6875000 NONE QAM64 # TS  23
+C 642000000 6875000 NONE QAM64 # TS  24
+C 650000000 6875000 NONE QAM64 # TS  25
+C 794000000 6875000 NONE QAM64 # TS  26
+C 409000000 6875000 NONE QAM64 # TS  27
+C 425000000 6875000 NONE QAM64 # TS 206
+C 417000000 6875000 NONE QAM64 # TS 207
diff --git a/util/scan/dvb-c/se-comhem b/util/scan/dvb-c/se-comhem
index 16bd7dd..7452c7f 100644
--- a/util/scan/dvb-c/se-comhem
+++ b/util/scan/dvb-c/se-comhem
@@ -1,3 +1,25 @@
 # com hem
 # freq sr fec mod
+C 289500000 6875000 NONE QAM64
+C 298000000 6875000 NONE QAM64
+C 306000000 6875000 NONE QAM64
+C 314000000 6875000 NONE QAM64
+C 322000000 6875000 NONE QAM64
+C 338000000 6875000 NONE QAM64
+C 346000000 6875000 NONE QAM64
+C 354000000 6875000 NONE QAM64
 C 362000000 6875000 NONE QAM64
+C 370000000 6875000 NONE QAM64
+C 378000000 6875000 NONE QAM64
+C 386000000 6875000 NONE QAM64
+C 394000000 6875000 NONE QAM64
+C 402000000 6875000 NONE QAM64
+C 418000000 6875000 NONE QAM64
+C 434000000 6875000 NONE QAM64
+C 442000000 6875000 NONE QAM64
+C 450000000 6875000 NONE QAM64
+C 458000000 6875000 NONE QAM64
+C 714000000 6875000 NONE QAM64
+C 722000000 6875000 NONE QAM64
+C 738000000 6875000 NONE QAM64
+C 786000000 6875000 NONE QAM64
diff --git a/util/scan/dvb-s/Agila2_C-146.0E b/util/scan/dvb-s/Agila2_C-146.0E
new file mode 100644
index 0000000..ac30747
--- /dev/null
+++ b/util/scan/dvb-s/Agila2_C-146.0E
@@ -0,0 +1,60 @@
+# Agila 2 @ 146.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# Viva Prime Channel
+S 3725000 H 2345000 3/4
+
+# Zoe Philippines
+S 3774000 V 3300000 3/4
+
+# Da Ai TV indonesia
+S 3791000 H 3100000 3/4
+
+# Trinity Broadcasting Multiplex
+S 3791000 V 10091000 5/6
+
+# Bayon TV
+S 3796000 H 3360000 3/4
+
+# White Springs TV
+S 3846000 H 6110000 3/4
+
+# TCT World
+S 3854000 H 2603000 5/6
+
+# CCTN
+S 3873000 V 2532000 3/4
+
+# NBN Philippines
+S 3875000 H 3000000 3/4
+
+# Al Masriyah
+S 3880000 H 2000000 3/4
+
+# Viva Entertainment Multiplex
+S 3887000 H 6716000 3/4
+
+# IBC13
+S 3896000 H 3000000 3/4
+
+# CTN Cambodia Multiplex
+S 3979000 V 9628000 3/4
+
+# Divya TV
+S 3990000 V 13330000 3/4
+
+# Familyland TV Network
+S 4164000 V 3735000 7/8
+
+# MTV Philippines
+S 4171000 V 3213000 3/4
+
+# The Old Path TV
+S 4183000 V 2170000 3/4
+
+# UNTV
+S 4188000 V 2170000 3/4
diff --git a/util/scan/dvb-s/Amos-4w b/util/scan/dvb-s/Amos-4w
index 3a80591..d10c48a 100644
--- a/util/scan/dvb-s/Amos-4w
+++ b/util/scan/dvb-s/Amos-4w
@@ -1,70 +1,48 @@
 # Amos 6 @ 4W
 # freq pol sr fec
-
-S 11419000 H 2604000 AUTO
-S 11347000 H 2800000 AUTO
-S 11423000 H 2894000 AUTO
-S 11338000 H 2960000 AUTO
-S 11133000 H 2963000 AUTO
-S 11631000 H 3200000 AUTO
-S 11132000 V 3254000 AUTO
-S 11154000 V 3255000 AUTO
-S 11319000 H 3333000 AUTO
-S 11426000 H 3333000 AUTO
-S 11575000 H 3333000 AUTO
-S 11638000 H 3333000 AUTO
-S 11323000 H 3350000 AUTO
-S 11328000 H 3350000 AUTO
-S 11350000 H 3350000 AUTO
-S 11359000 H 3350000 AUTO
-S 11332000 H 3500000 AUTO
-S 11128000 V 3700000 AUTO
-S 11343000 H 3700000 AUTO
-S 11626000 H 4000000 AUTO
-S 11443000 H 4164000 AUTO
-S 11644000 V 4340000 AUTO
-S 11432000 V 4500000 AUTO
-S 10993000 H 4850000 AUTO
-S 11191000 H 6111000 AUTO
-S 11183000 H 6428000 AUTO
-S 10986000 H 6666000 AUTO
-S 11144000 H 6666000 AUTO
-S 11151000 H 6666000 AUTO
-S 11161000 H 6666000 AUTO
-S 11172000 H 6666000 AUTO
-S 11209000 H 6666000 AUTO
-S 11219000 H 6666000 AUTO
-S 11413000 H 6666000 AUTO
-S 11673000 H 6900000 AUTO
-S 11435000 H 7480000 AUTO
-S 11546000 H 8050000 AUTO
-S 11177000 V 8520000 AUTO
-S 11585000 H 8888000 AUTO
-S 11235000 H 10000000 AUTO
-S 11144000 V 11110000 AUTO
-S 11652000 V 11111000 AUTO
-S 11560000 H 13400000 AUTO
-S 11690000 H 15000000 AUTO
-S 11652000 H 16100000 AUTO
-S 11303000 H 19540000 AUTO
-S 11390000 H 24000000 AUTO
-S 10762000 H 26000000 AUTO
-S 10720000 V 27500000 AUTO
-S 10723000 H 27500000 AUTO
-S 10758000 V 27500000 AUTO
-S 10803000 V 27500000 AUTO
-S 10805000 H 27500000 AUTO
-S 10841000 V 27500000 AUTO
-S 10842000 H 27500000 AUTO
-S 10889000 H 27500000 AUTO
-S 10889000 V 27500000 AUTO
-S 10924000 H 27500000 AUTO
-S 10924000 V 27500000 AUTO
-S 10972000 V 27500000 AUTO
-S 11008000 V 27500000 AUTO
-S 11260000 H 27500000 AUTO
-S 11474000 V 27500000 AUTO
-S 11510000 V 27500000 AUTO
-S 11558000 V 27500000 AUTO
-S 11592000 V 27500000 AUTO
-S 11677000 V 27500000 AUTO
+S 10722000 H 27500000 3/4
+S 10722000 V 27500000 3/4
+S 10722000 V 30000000 2/3
+S 10758000 V 27500000 3/4
+S 10758000 V 30000000 2/3
+S 10759000 H 30000000 3/4
+S 10806000 H 27500000 5/6
+S 10806000 V 27500000 3/4
+S 10842000 H 27500000 7/8
+S 10842000 V 27500000 3/4
+S 10842000 V 30000000 2/3
+S 10890000 H 27500000 7/8
+S 10890000 V 27500000 3/4
+S 10925000 H 27500000 7/8
+S 10925000 V 27500000 3/4
+S 10972000 V 27500000 3/4
+S 11008000 V 27500000 3/4
+S 11015000 H 2295000 3/4
+S 11123000 H 1850000 7/8
+S 11167000 H 12500000 5/6
+S 11179000 H 6666000 3/4
+S 11260000 H 27500000 3/4
+S 11304000 H 19540000 3/4
+S 11319000 H 2750000 3/4
+S 11329000 H 3333000 3/4
+S 11333000 H 3500000 3/4
+S 11347000 H 3350000 3/4
+S 11384000 H 19000000 5/6
+S 11411000 H 7925000 5/6
+S 11429000 H 5925000 3/4
+S 11435000 H 2089000 3/4
+S 11474000 V 27500000 3/4
+S 11510000 V 30000000 2/3
+S 11558000 V 27500000 3/4
+S 11559000 H 13400000 7/8
+S 11572000 H 8888000 3/4
+S 11592000 H 21350000 3/4
+S 11593000 V 27500000 3/4
+S 11625000 V 3000000 3/4
+S 11630000 H 2963000 3/4
+S 11630000 V 3000000 3/4
+S 11637000 V 1480000 3/4
+S 11647000 H 9167000 3/4
+S 11647000 V 8518000 3/4
+S 11654000 H 2000000 5/6
+S 11658000 V 8520000 5/6
diff --git a/util/scan/dvb-s/Apstar6_C-134.0E b/util/scan/dvb-s/Apstar6_C-134.0E
new file mode 100644
index 0000000..6a8a1f1
--- /dev/null
+++ b/util/scan/dvb-s/Apstar6_C-134.0E
@@ -0,0 +1,15 @@
+# Apstar 6 @ 134.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# New Entertainment
+S 3766000 H 4285000 3/4
+
+# Test
+S 3840000 H 27500000 3/4
+
+# TV Nusantara
+S 3905000 H 3250000 3/4
diff --git a/util/scan/dvb-s/AsiaSat2_C-100.5E b/util/scan/dvb-s/AsiaSat2_C-100.5E
new file mode 100644
index 0000000..1cc8035
--- /dev/null
+++ b/util/scan/dvb-s/AsiaSat2_C-100.5E
@@ -0,0 +1,51 @@
+# AsiaSat 2 100.5E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# Iris Sat Multiplex
+S 3660000 V 27500000 3/4
+
+# APTN Direct
+S 3706000 H 4167000 5/6
+
+# APTN Global Video Wire (MPEG-4 S/2)
+S 3732000 H 8889000 2/3
+
+# BYU TV
+S 3767000 V 6527000 1/2
+
+# AJK TV
+S 3778000 V 3333000 3/4
+
+# RTB International Brunei
+S 3786000 H 6000000 7/8
+
+# Shamshad TV
+S 3790000 V 2444000 3/4
+
+# FTV HD (MPEG-4 S/2)
+S 3794000 H 4640000 3/4
+
+# Arabsat ASBU Bouquet Multiplex
+S 3820000 V 27500000 3/4
+
+# Star TV Multiplex (MPEG-4 S/2)
+S 3840000 H 30000000 3/4
+
+# E Network Multiplex
+S 3880000 H 27500000 3/4
+
+# SatLink Multiplex
+S 3960000 H 27500000 3/4
+
+# Star TV Multiplex
+S 3980000 V 28100000 3/4
+
+# SatLink European Bouquet (MPEG-2 & MPEG-4 S2)
+S 4000000 H 28125000 3/4
+
+# Macau Satellite TV Multiplex
+S 4148000 V 11852000 3/4
diff --git a/util/scan/dvb-s/AsiaSat3S_C-105.5E b/util/scan/dvb-s/AsiaSat3S_C-105.5E
index 8e98a5d..4d09ef5 100644
--- a/util/scan/dvb-s/AsiaSat3S_C-105.5E
+++ b/util/scan/dvb-s/AsiaSat3S_C-105.5E
@@ -1,122 +1,102 @@
 # AsiaSat 3S 105.5E C-BAND
-# Generated by Xingbo Wang
-# Apr 2, 2005
+# Generated by Pietro Casoar
+# 1st March 2009
 
-# MPEG-2 QPSK
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
 # freq pol sr fec
 
-# [encrypted] ZEE English, ZEE TV International, ZEE Movies, MX, ZEE TV SE Asia, ZEE TV Asia, Trendz
-S 3700000 V 27500000 3/4
+# China Entertainment TV & Maharishi Veda Vision
+S 3680000 H 26670000 3/4
+
+# MediaCorp Channel News Asia
+S 3706000 H 6000000 3/4
 
 # BTV World
 S 3725000 V 4450000 3/4
 
-# SAB TV
-S 3743000 V 3300000 3/4
-
-# AAJ TV
-S 3750000 V 2820000 3/4
-
-# Arirang TV
-S 3755150 V 4417900 7/8
-
-# [encrypted] STAR Plus India, STAR Movies India, STAR News India, National Geographic India, STAR Gold, STAR Movies (Middle East)
-# STAR Utsav
-S 3780000 V 28100000 3/4
+# Galaxy TVB
+S 3729000 H 13650000 3/4
 
-# Chinese Provincial TV: Guangxi, Shanxi, Anhui, Jiangsu, Heilongjiang
-S 3806000 V 4420000 3/4
-S 3813000 V 4420000 3/4
-S 3820000 V 4420000 3/4
-S 3827000 V 4420000 3/4
-S 3834000 V 4420000 3/4
+# Zee Network
+S 3733000 V 6500000 3/4
 
-# [encrypted] ESPN Taiwan, STAR Sports Taiwan, ESPN Asia, STAR Sports South East Asia, STAR Sports India, ESPN India, ESPN Philippines
-S 3860000 V 27500000 3/4
+# Madani Channel
+S 3739000 V 2815000 3/4
 
-# Dragon TV
-S 3886000 V 4800000 3/4
+# Fashion TV
+S 3746000 V 2625000 3/4
 
-# Shandong TV
-S 3895000 V 6813000 3/4
+# Aaj News
+S 3750000 V 2821000 3/4
 
-# CCTV-1(comprehensive), China National Radio Channel 1
-S 3904000 V 4420000 7/8
+# Arirang Arab
+S 3755000 V 4418000 7/8
 
-# Jilin Provincial TV
-S 3914500 V 4420000 3/4
+# Globecast multiplex
+S 3760000 H 26000000 7/8
 
-# [encrypted] A1, History, STAR Movies SEA/China, STAR World India, STAR Plus Pakistan, Channel[V] India, STAR Chinese Movies, CNBC India, STAR One, STAR Vijay
-S 3980000 V 28100000 3/4
+# Star TV Multiplex
+S 3780000 V 28100000 3/4
 
-# Sahara One, Sahara Samay National, Sahara Samay Mumbai, Sahara Samay Uttar Pradesh, Sahara Samay Bihar, Sahara Samay Madhya Pradesh
-S 4020000 V 27250000 3/4
+# Airwaves Media Multiplex
+S 3786000 H 5700000 3/4
 
-# Tianjin TV
-S 4046000 V 5950000 3/4
+# Zee Network Multiplex
+S 3820000 V 27500000 3/4
 
-# PTV-1, PTV World, PTV Channel 3, AVT Khyber
-S 4091000 V 13333000 3/4
+# Star TV Multiplex
+S 3840000 H 26850000 7/8
 
-# PTV National
-S 4106000 V 3333300 3/4
+# Star TV Multiplex
+S 3860000 V 27500000 3/4
 
-# Indus News
-S 4115750 V 3333000 3/4
+# B4U INDIA - MPEG-4 S/2 Multiplex
+S 3880000 H 27500000 3/4
 
-# [encrypted] ZEE Biz, ZEE News, ZEE Cinema, ZEE Music, Alpha TV Punjabi, Alpha TV Gujarati, Alpha TV Bangla, Alpha TV Marathi, Smile TV
-S 4140000 V 27500000 3/4
+# Star TV Multiplex
+S 3940000 V 28100000 3/4
 
-# Chinese Provincial TV: Henan, Fujian, Jiangxi, Liaoning
-S 4166000 V 4420000 3/4
-S 4180000 V 4420000 3/4
-S 4187000 V 4420000 3/4
-S 4194000 V 4420000 3/4
+# Tuner International Multiplex
+S 3960000 H 28100000 3/4
 
-# CETV
-S 3680000 H 26670000 3/4
+# Star TV Multiplex
+S 3980000 V 28100000 3/4
 
-# Channel NewsAsia
-S 3706000 H 6000000 3/4
+# Star TV Multiplex
+S 4000000 H 26850000 7/8
 
-# Asia Plus
-S 3715500 H 7000000 3/4
+# Sahara Samay Multiplex
+S 4020000 V 27250000 3/4
 
-# TVB 8, CETV
-S 3729000 H 13650000 3/4
+# VOA Voice Of America Multiplex
+S 4040000 H 20400000 1/2
 
-# Network of the World, Bloomberg TV Asia, Indus Vision, Indus Music, Muslim TV Ahmadiyya, Living Asia Channel
-# [encrypted] Filmazia
-S 3760000 H 26000000 7/8
+# Globecast Multiplex
+S 4071000 H 14240000 3/4
 
-# [encrypted] Fox News, Sky News, STAR Movies Int'l Taiwan, National Geographic Taiwan, STAR Chinese Channel, STAR Movies mandarin, Channel[V] Taiwan
-S 3840000 H 26850000 7/8
+# PTV Multiplex
+S 4091000 V 13333000 3/4
 
-# STAR Sports Asia
-# [encrypted] ESPN China, STAR Sports Hong Kong, ESPN Hong Kong
-S 3920000 H 26750000 7/8
+# Sun TV
+S 4095000 H 5554000 3/4
 
-# [encrypted] CNN International Asia, CNN Newsource, Cartoon Network Asia, Cartoon Network Taiwan, Cartoon Network Philippines, Cartoon Network Australia/New Zealand, TCM Australia, Boomerang
-S 3960000 H 27500000 3/4
+# PTV Global USA
+S 4102000 V 2894000 3/4
 
-# [encrypted] Phoenix Movies, star World Asia, Star Movies Int'l, Channel[V] International, National Geographic Regional
-# Phoenix Chinese Channel, Phoenix Info News Channel, Xiong Kong Int'l, Xing Kong Regional, Channel[V](Greater China)
-S 4000000 H 26850000 7/8
+# PTV Global UK & Europe
+S 4106000 V 2894000 3/4
 
-# Chinese Provincial TV: Hubei, Sichuan
-S 4034600 H 4420000 3/4
-S 4051000 H 4420000 3/4
+# Galaxy TVB Multiplex
+S 4111000 H 13650000 3/4
 
-# Chinese Provincial TV: Qinghai, Hunan
-S 4067000 H 4420000 3/4
-S 4082000 H 4420000 3/4
+# PTV Multiplex
+S 4114000 V 7000000 3/4
 
-# Sun TV
-S 4094000 H 5555000 3/4
+# Eye TV Multiplex
+S 4129000 H 13600000 3/4
 
-# MATV, Horizon Channel
-# [encrypted] Tian Ying Movies Channel, TVB Xing He Channel
-S 4111000 H 13650000 3/4
+# Zee Network Multiplex
+S 4140000 V 27500000 3/4
 
-# CCTV Channel 4 (International), Channel 9 (English language), CCTV E&F
-S 4129000 H 13240000 3/4
+# Geo TV Network Multiplex
+S 4180000 V 26666000 3/4
diff --git a/util/scan/dvb-s/Asiasat4_C-122.2E b/util/scan/dvb-s/Asiasat4_C-122.2E
new file mode 100644
index 0000000..60a9730
--- /dev/null
+++ b/util/scan/dvb-s/Asiasat4_C-122.2E
@@ -0,0 +1,27 @@
+# Asiasat 4 @ 122.2E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# SITI Digital Network Multiplex
+S 3760000 H 27500000 3/4
+
+# SITI Digital Network Multiplex
+S 3820000 V 27500000 3/4
+
+# Henan Radio Multiplex
+S 3856000 H 2170000 3/4
+
+# SITI Digital Network Multiplex
+S 3880000 H 27500000 3/4
+
+# SITI Digital network Multiplex
+S 3920000 H 27500000 3/4
+
+# SITI Digital network Multiplex
+S 3960000 H 27500000 3/4
+
+# SITI Digital network Multiplex
+S 4180000 V 27500000 3/4
diff --git a/util/scan/dvb-s/Astra-23.5E b/util/scan/dvb-s/Astra-23.5E
new file mode 100644
index 0000000..6e45dbf
--- /dev/null
+++ b/util/scan/dvb-s/Astra-23.5E
@@ -0,0 +1,66 @@
+# Astra 23.5E
+# freq pol sr fec
+S 10758000 V 22000000 7/8
+S 10788000 V 22000000 5/6
+S 10802000 H 22000000 5/6
+S 10842000 V 13333000 5/6
+S 10862000 H 22000000 5/6
+# Astra2Connect
+# S2 10891250 H 22000000 3/4 AUTO 8PSK
+S 11475000 V 27500000 3/4
+S 11515000 H 27500000 3/4
+S2 11515000 V 28500000 9/10 AUTO QPSK
+S2 11555000 H 28500000 9/10 AUTO QPSK
+S2 11555000 V 28500000 9/10 AUTO QPSK
+S2 11592000 V 28500000 9/10 AUTO QPSK
+S2 11595000 H 28500000 9/10 AUTO QPSK
+S2 11635000 H 28500000 9/10 AUTO QPSK
+S2 11635000 V 28500000 9/10 AUTO QPSK
+S 11675000 H 27500000 3/4
+S2 11675000 V 28500000 9/10 AUTO QPSK
+S2 11719000 H 27500000 9/10 AUTO QPSK
+S 11739000 V 27500000 3/4
+# Astra2Connect
+# S2 11758000 H 27500000 5/6 AUTO 8PSK
+S2 11778000 V 27500000 9/10 AUTO QPSK
+S 11798000 H 27500000 3/4
+S2 11817000 V 27500000 9/10 AUTO QPSK
+S 11836000 H 29900000 3/4
+S2 11856000 V 27500000 5/6 AUTO QPSK
+S 11875000 H 27500000 3/4
+S 11914000 H 27500000 3/4
+# Astra2Connect
+# S2 11954000 H 27500000 3/4 AUTO 8PSK
+S 11992000 H 27500000 3/4
+S 12012000 V 27500000 3/4
+S2 12032000 H 27500000 9/10 AUTO QPSK
+S 12070000 H 27500000 3/4
+S2 12109000 H 27500000 9/10 AUTO QPSK
+# Astra2Connect
+# S2 12148000 H 27500000 3/4 AUTO 8PSK
+S 12168000 V 27500000 3/4
+# Astra2Connect
+# S2 12226000 H 27500000 3/5 AUTO 8PSK
+# Astra2Connect
+# S2 12304000 H 27500000 5/6 AUTO 8PSK
+# Astra2Connect
+# S2 12344000 H 28200000 5/6 AUTO 8PSK
+# Astra2Connect
+# S2 12382000 H 27500000 3/4 AUTO 8PSK
+S 12525000 H 27500000 3/4
+S 12525000 V 27500000 3/4
+S 12565000 H 27500000 2/3
+S 12565000 V 27500000 3/4
+S2 12605000 H 28500000 9/10 AUTO QPSK
+S2 12605000 V 28500000 9/10 AUTO QPSK
+S 12630000 V 6000000 3/4
+S 12631000 H 6666000 7/8
+S 12636000 V 2277000 5/6
+S 12641000 H 2220000 7/8
+S 12644000 H 2170000 3/4
+S 12649000 H 5600000 5/6
+S 12661000 H 2170000 5/6
+S 12685000 V 27500000 3/4
+S 12696000 H 3255000 1/2
+S 12711000 H 6111000 AUTO
+S 12725000 V 27500000 3/4
diff --git a/util/scan/dvb-s/Atlantic-Bird-1-12.5W b/util/scan/dvb-s/Atlantic-Bird-1-12.5W
index 5c38433..6735d70 100644
--- a/util/scan/dvb-s/Atlantic-Bird-1-12.5W
+++ b/util/scan/dvb-s/Atlantic-Bird-1-12.5W
@@ -1,20 +1,30 @@
 # Atlantic Bird 1 @ 12.5W
 # freq pol sr fec
-
-S 11682000 H 05632000 AUTO
-S 11673000 H 06111000 AUTO
-S 11664000 H 06111000 AUTO
-S 11655000 H 06666000 AUTO
-S 11690000 H 05700000 AUTO
-S 11596000 V 27500000 AUTO
-S 11618000 H 02324000 AUTO
-S 11590000 H 06111000 AUTO
-S 11597000 H 03184000 AUTO
-S 11629000 H 06507000 AUTO
-S 11622000 H 03255000 AUTO
-S 11585000 H 05632000 AUTO
-S 11643000 H 02398000 AUTO
-S 11647000 H 03990000 AUTO
-S 11647000 V 03990000 AUTO
-S 11693000 V 04800000 AUTO
-S 11644000 V 04800000 AUTO
+S 11099000 H 2000000 5/6
+S 11132000 H 3255000 3/4
+S 11136000 V 3700000 5/6
+S 11174000 H 15190000 3/4
+S 11179000 V 22400000 2/3
+S 11188000 H 5722000 5/6
+S 11332000 H 6428000 2/3
+S 11337000 H 1923000 7/8
+S 11340000 H 2279000 5/6
+S 11355000 H 11781000 7/8
+S 11408000 V 27500000 3/4
+S 11428000 H 30000000 5/6
+S 11595000 V 27500000 5/6
+S 11622000 H 3255000 AUTO
+S 11643000 H 2398000 AUTO
+S 11645000 V 4790000 AUTO
+S 11651000 V 3688000 AUTO
+S 12515000 H 17455000 3/4
+S 12535000 V 2000000 3/4
+S 12545000 H 17455000 3/4
+S 12594000 H 2170000 3/4
+S 12597000 H 1730000 3/4
+S 12604000 H 1481000 3/4
+S 12655000 H 4285000 3/4
+S 12659000 H 2141000 3/4
+S 12662000 V 3928000 3/4
+S 12720000 V 1808000 3/4
+S 12743000 V 3214000 3/4
diff --git a/util/scan/dvb-s/Atlantic-Bird-3-5.0W b/util/scan/dvb-s/Atlantic-Bird-3-5.0W
new file mode 100644
index 0000000..4e7f007
--- /dev/null
+++ b/util/scan/dvb-s/Atlantic-Bird-3-5.0W
@@ -0,0 +1,4 @@
+# Atlantic Bird 3 @ 5.0W
+# freq pol sr fec
+S 11096000 V 29950000 7/8
+S 11591000 V 20000000 2/3
diff --git a/util/scan/dvb-s/Chinastar1_C-87.5E b/util/scan/dvb-s/Chinastar1_C-87.5E
new file mode 100644
index 0000000..0c03cfc
--- /dev/null
+++ b/util/scan/dvb-s/Chinastar1_C-87.5E
@@ -0,0 +1,15 @@
+# ChinaStar 1 @ 87.5E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# Myawady TV
+S 3734000 H 5925000 3/4
+
+# Zam TV Tests
+S 4076000 H 2532000 3/4
+
+# Test Card
+S 4081000 H 4687000 3/4
diff --git a/util/scan/dvb-s/Insat2E_C-83.0E b/util/scan/dvb-s/Insat2E_C-83.0E
new file mode 100644
index 0000000..8e76b8e
--- /dev/null
+++ b/util/scan/dvb-s/Insat2E_C-83.0E
@@ -0,0 +1,93 @@
+# Insat 2E @ 83.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# NE TV Multiplex
+S 3521000 V 8640000 3/4
+
+# NE TV Multiplex
+S 3537000 V 10800000 3/4
+
+# TV 9 Telugu
+S 3550000 V 3255000 3/4
+
+# S1 Channel
+S 3559000 V 3366000 3/4
+
+# TV 9 Kannada
+S 3581000 V 3255000 3/4
+
+# Jaya TV
+S 3593000 V 8680000 3/4
+
+# Tata Communications Multiplex
+S 3593000 V 9629000 3/4
+
+# Asianet Multiplex
+S 3643000 V 19531000 3/4
+
+# Amrita TV Middle East
+S 3678000 V 5926000 3/4
+
+# Mahaa TV
+S 3689000 V 2893000 3/4
+
+# Tata Communications Multiplex
+S 3696000 V 6111000 3/4
+
+# CNBC India
+S 3760000 V 6500000 3/4
+
+# Raj TV Network Multiplex
+S 3774000 V 13021000 3/4
+
+# UTVi TV
+S 3794000 V 3500000 3/5
+
+# PTC Multiplex (MPEG-4 S/2)
+S 3815000 V 6000000 3/4
+
+# Tata Communications Multiplex
+S 3845000 V 26043000 3/4
+
+# Indiavision
+S 3914000 V 3000000 3/4
+
+# Yes Indiavision
+S 3919000 V 3000000 3/4
+
+# Manorama News International
+S 3923000 V 3000000 3/4
+
+# Tata Communications Multiplex
+S 3934000 V 13021000 3/4
+
+# Raj Musix kanada
+S 3961000 V 6656000 3/4
+
+# TV 9 Multiplex
+S 3974000 V 13333000 3/4
+
+# Asianet Multiplex
+S 4010000 V 19531000 3/4
+
+# Tata Communications Multiplex
+S 4031000 V 7440000 7/8
+
+# RRSat Multiplex
+S 4042000 V 7420000 7/8
+
+# Tata Communications Multiplex
+S 4050000 V 5084000 7/8
+
+# DD national
+S 4070000 V 5000000 3/4
+
+# Indiasign Mulitplex
+S 4091000 V 9230000 7/8
+
+# News Live (MPEG-4 S/2)
+S 4100000 V 4700000 3/4
diff --git a/util/scan/dvb-s/Insat3A_C-93.5E b/util/scan/dvb-s/Insat3A_C-93.5E
new file mode 100644
index 0000000..b4430df
--- /dev/null
+++ b/util/scan/dvb-s/Insat3A_C-93.5E
@@ -0,0 +1,66 @@
+# Insat 3A @ 93.5E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# DD Bangla
+S 3732000 V 6250000 3/4
+
+# DD Punjab
+S 3740000 V 6250000 3/4
+
+# DD Gujarati
+S 3750000 V 6250000 3/4
+
+# DD Chandana
+S 3759000 V 6250000 3/4
+
+# DD Oriya
+S 3772000 V 6250000 3/4
+
+# DD kashir
+S 3782000 V 6250000 3/4
+
+# DD Sahyadri
+S 3791000 V 8600000 3/4
+
+# DD Malayalam
+S 3812000 V 6250000 3/4
+
+# DD Saptagiri
+S 3820000 V 6250000 3/4
+
+# DD podhigai
+S 3831000 V 8600000 3/4
+
+# DD Himachal Pradesh
+S 3932000 V 6250000 3/4
+
+# DD Jaipur
+S 3940000 V 6250000 3/4
+
+# Madhya Pradesh
+S 3950000 V 6250000 3/4
+
+# DD Uttar Pradesh
+S 3958000 V 6250000 3/4
+
+# DD North East
+S 4092000 V 6250000 3/4
+
+# DD Mizoram
+S 4101000 V 6250000 3/4
+
+# DD Tripura
+S 4109000 V 4250000 3/4
+
+# RTA Afghanistan
+S 4132000 V 4000000 3/4
+
+# RTA Afghanistan Nangarhar
+S 4136000 V 2000000 3/4
+
+# Ariana TV Network Multiplex
+S 4141000 V 5150000 3/4
diff --git a/util/scan/dvb-s/Insat4A_C-83.0E b/util/scan/dvb-s/Insat4A_C-83.0E
new file mode 100644
index 0000000..fa27210
--- /dev/null
+++ b/util/scan/dvb-s/Insat4A_C-83.0E
@@ -0,0 +1,93 @@
+# Insat 4A @ 83.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# NSTPL Multiplex
+S 3725000 H 26665000 3/4
+
+# Indiasign multiplex
+S 3756000 H 13333000 3/4
+
+# Star TV Multiplex
+S 3777000 H 10900000 3/4
+
+# Essel Shyam Multiplex
+S 3805000 H 28500000 7/8
+
+# Tarang TV Multiplex (MPEG-4 S/2)
+S 3841000 H 6920000 3/4
+
+# CTVN AKD Plus
+S 3853000 H 3265000 3/4
+
+# Kasthuri TV
+S 3857000 H 3462000 3/4
+
+# Kamyab TV
+S 3874000 H 3403000 3/4
+
+# Vanitha TV
+S 3892000 H 3300000 3/4
+
+# Essel Shayam Multiplex
+S 3898000 H 6800000 3/4
+
+# Channel 10 India
+S 3910000 H 3600000 7/8
+
+# Essel Shyam
+S 3923000 H 13000000 3/4
+
+# DY 365
+S 3949000 H 3225000 3/4
+
+# Multiplex
+S 3958000 H 9500000 7/8
+
+# Zee News Uttar Pradesh
+S 3976000 H 3200000 3/4
+
+# ETV Network Multiplex
+S 4004000 H 22220000 5/6
+
+# Essel Shyam
+S 4040000 H 7500000 7/8
+
+# Lamhas Multiplex
+S 4054000 H 13230000 3/4
+
+# Network 18 Multiplex
+S 4072000 H 6500000 3/4
+
+# IBN Lokmat
+S 4078000 H 3250000 3/4
+
+# Live India
+S 4087000 H 3300000 3/4
+
+# Mi Marathi
+S 4091000 H 3000000 3/4
+
+# BBS TV
+S 4100000 H 4750000 3/4
+
+# Manorama News
+S 4115000 H 5555000 3/4
+
+# BAG Films
+S 4134000 H 10600000 3/4
+
+# Zee Network Multiplex
+S 4151000 H 6500000 3/4
+
+# Zee Network Multiplex
+S 4161000 H 6500000 3/4
+
+# Lok Sabha TV
+S 4170000 H 6500000 3/4
+
+# Kolkata TV
+S 4180000 H 3233000 3/4
diff --git a/util/scan/dvb-s/Insat4B_C-93.5E b/util/scan/dvb-s/Insat4B_C-93.5E
new file mode 100644
index 0000000..5431ae0
--- /dev/null
+++ b/util/scan/dvb-s/Insat4B_C-93.5E
@@ -0,0 +1,51 @@
+# Insat 4B @ 93.5E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# Doordarshan Multiplex
+S 3725000 H 27500000 3/4
+
+# DD Dehradun
+S 3750000 H 4250000 3/4
+
+# DD Raipur
+S 3762000 H 4250000 3/4
+
+# DD Ranchi
+S 3768000 H 4250000 3/4
+
+# DD Jammu
+S 3774000 H 4250000 3/4
+
+# DD Hissar
+S 3802000 H 4250000 3/4
+
+# DD Chandigarh
+S 3808000 H 4250000 3/4
+
+# DD Port Blair
+S 3822000 H 4250000 3/4
+
+# DD Bihar
+S 3832000 H 6250000 3/4
+
+# DD North East
+S 3841000 H 6250000 3/4
+
+# Sun network
+S 3885000 H 28000000 3/4
+
+# Doordarshan Multiplex
+S 3925000 H 27500000 3/4
+
+# Sakshi TV
+S 3950000 H 4440000 3/4
+
+# Tata Communications Multiplex
+S 4005000 H 25422000 7/8
+
+# Sun Network
+S 4045000 H 28000000 3/4
diff --git a/util/scan/dvb-s/Intelsat-1002-1.0W b/util/scan/dvb-s/Intelsat-1002-1.0W
index 09d82ca..0142ded 100644
--- a/util/scan/dvb-s/Intelsat-1002-1.0W
+++ b/util/scan/dvb-s/Intelsat-1002-1.0W
@@ -1,5 +1,20 @@
 # Intelsat 1002 @ 1.0W
 # freq pol sr fec
-
 S 4175000 V 28000000 AUTO
 S 4180000 H 21050000 AUTO
+S 11093000 H 19191000 7/8
+S 11166000 V 1450000 7/8
+S 11182000 V 3100000 7/8
+S 11606000 H 13356000 7/8
+S 12527000 H 27500000 3/4
+S 12563000 H 27500000 3/4
+S 12563000 V 27500000 3/4
+S 12607000 H 27500000 3/4
+S 12607000 V 27500000 3/4
+S 12643000 H 27500000 3/4
+S 12643000 V 27500000 3/4
+S 12687000 H 27500000 3/4
+S 12687000 V 27500000 3/4
+S 12718000 V 18400000 3/4
+S 12723000 H 27500000 3/4
+S 12735000 V 8800000 5/6
diff --git a/util/scan/dvb-s/Intelsat8_C-166.0E b/util/scan/dvb-s/Intelsat8_C-166.0E
new file mode 100644
index 0000000..6c671cc
--- /dev/null
+++ b/util/scan/dvb-s/Intelsat8_C-166.0E
@@ -0,0 +1,39 @@
+# Intelsat 8 @ 166.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# Viacom Multiplex
+S 3740000 H 27500000 2/3
+
+# South Korean Multiplex
+S 3790000 V 6510000 3/4
+
+# Arirang World
+S 3815000 V 4400000 3/4
+
+# Australian network Multiplex
+S 3829000 H 13238000 3/4
+
+# TVBS multiplex
+S 3833000 V 17500000 3/4
+
+# NBC Universal
+S 3900000 H 27500000 3/4
+
+# Intelsat multiplex
+S 3940000 H 27690000 7/8
+
+# China Radio multiplex
+S 3959000 V 3428000 3/4
+
+# NHK World network Multiplex
+S 4060000 H 16180000 1/2
+
+# Philippines Network TV Multiplex
+S 4122000 V 5554000 3/4
+
+# TAS Multiplex
+S 4130000 V 5800000 3/4
diff --git a/util/scan/dvb-s/JCSat3A_C-128.0E b/util/scan/dvb-s/JCSat3A_C-128.0E
new file mode 100644
index 0000000..71f68d1
--- /dev/null
+++ b/util/scan/dvb-s/JCSat3A_C-128.0E
@@ -0,0 +1,18 @@
+# JCSAT 3A @ 128.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# TAS Multiplex
+S 3960000 V 30000000 5/6
+
+# TAS Multiplex
+S 4000000 V 30000000 5/6
+
+# Miraclenet
+S 4055000 V 3332000 3/4
+
+# TAS Multiplex
+S 4120000 V 30000000 5/6
diff --git a/util/scan/dvb-s/Measat3_C-91.5E b/util/scan/dvb-s/Measat3_C-91.5E
new file mode 100644
index 0000000..2753ac0
--- /dev/null
+++ b/util/scan/dvb-s/Measat3_C-91.5E
@@ -0,0 +1,54 @@
+# Measat 3 @ 91.5E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# Shop TV
+S 3629000 V 2200000 3/4
+
+# Aora TV Mulitplex
+S 3644000 H 22320000 3/4
+
+# Solar Entertainment
+S 3645000 V 19510000 3/4
+
+# National Geographic music
+S 3718000 V 1700000 7/8
+
+# DZRH TV Multiplex
+S 3721000 V 2170000 3/4
+
+# Ascent Media (MPEG-4 S/2)
+S 3751000 V 13330000 2/3
+
+# Globecast Multiplex (MPEG-4 S/2)
+S 3769000 V 14000000 3/4
+
+# HTV Multiplex
+S 3796000 V 7030000 3/4
+
+# Sky International
+S 3814000 V 6666000 3/4
+
+# Un-named Mulitplex
+S 3865000 V 3835000 3/4
+
+# RTM Multiplex
+S 3877000 V 12525000 7/8
+
+# RTM Sarawak Feeds
+S 3887000 V 3984000 3/4
+
+# Globecast Multiplex
+S 3920000 V 28000000 7/8
+
+# Ginx TV
+S 4113000 V 2960000 3/4
+
+# YR Asia TV
+S 4117000 V 2963000 3/4
+
+# All Sports Network (MPEG-4 S/2)
+S 4134000 V 7200000 3/4
diff --git a/util/scan/dvb-s/Nilesat101+102-7.0W b/util/scan/dvb-s/Nilesat101+102-7.0W
index 64c1921..8ef176f 100644
--- a/util/scan/dvb-s/Nilesat101+102-7.0W
+++ b/util/scan/dvb-s/Nilesat101+102-7.0W
@@ -1,36 +1,41 @@
 # Nilesat 101/102 & Atlantic Bird @ 7W
 # freq pol sr fec
-S 10758000 V 27500000 AUTO
-S 10796000 V 27500000 AUTO
-S 10853000 H 27500000 AUTO
-S 10873000 V 27500000 AUTO
-S 10892000 H 27500000 AUTO
-S 10911000 V 27500000 AUTO
-S 10930000 H 27500000 AUTO
-S 11747000 V 27500000 AUTO
-S 11766000 H 27500000 AUTO
-S 11785000 V 27500000 AUTO
-S 11804000 H 27500000 AUTO
-S 11823000 V 27500000 AUTO
-S 11843000 H 27500000 AUTO
-S 11862000 V 27500000 AUTO
-S 11881000 H 27500000 AUTO
-S 11900000 V 27500000 AUTO
-S 11919000 H 27500000 AUTO
-S 11938000 V 27500000 AUTO
-S 11958000 H 27500000 AUTO
-S 11977000 V 27500000 AUTO
-S 11996000 H 27500000 AUTO
-S 12015000 V 27500000 AUTO
-S 12034000 H 27500000 AUTO
-S 12054000 V 27500000 AUTO
-S 12073000 H 27500000 AUTO
-S 12130000 V 27500000 AUTO
-S 12149000 H 27500000 AUTO
-S 12207000 V 27500000 AUTO
-S 12226000 H 27500000 AUTO
-S 12284000 V 27500000 AUTO
-S 12303000 H 27500000 AUTO
-S 12341000 V 27500000 AUTO
-S 12360000 H 27500000 AUTO
-S 12399000 H 27500000 AUTO
+S 10719000 V 27500000 3/4
+S 10723000 H 27500000 3/4
+S 10758000 V 27500000 3/4
+S 10775000 H 27500000 3/4
+S 10796000 V 27500000 3/4
+S 10892000 H 27500000 3/4
+S 10911000 V 27500000 3/4
+S 10930000 H 27500000 3/4
+S 11317000 V 27500000 3/4
+S 11747000 V 27500000 3/4
+S 11766000 H 27500000 3/4
+S 11785000 V 27500000 3/4
+S 11804000 H 27500000 3/4
+S 11823000 V 27500000 3/4
+S 11843000 H 27500000 3/4
+S 11862000 V 27500000 3/4
+S 11881000 H 27500000 3/4
+S 11900000 V 27500000 3/4
+S 11919000 H 27500000 3/4
+S 11938000 V 27500000 3/4
+S 11958000 H 27500000 3/4
+S 11977000 V 27600000 5/6
+S 11996000 H 27500000 3/4
+S 12015000 V 27500000 3/4
+S 12034000 H 27500000 3/4
+S 12054000 V 27500000 3/4
+S 12073000 H 27500000 3/4
+S 12130000 V 27500000 3/4
+S 12149000 H 27500000 3/4
+S 12207000 V 27500000 3/4
+S 12226000 H 27500000 3/4
+S 12284000 V 27500000 3/4
+S 12303000 H 27500000 3/4
+S 12341000 V 27500000 3/4
+S 12360000 H 27500000 3/4
+S 12380000 V 27500000 3/4
+S 12399000 H 27500000 3/4
+S 12418000 V 27500000 3/4
+S 12476000 H 27500000 3/4
diff --git a/util/scan/dvb-s/PalapaC2_C-113.0E b/util/scan/dvb-s/PalapaC2_C-113.0E
new file mode 100644
index 0000000..d9b0fc8
--- /dev/null
+++ b/util/scan/dvb-s/PalapaC2_C-113.0E
@@ -0,0 +1,39 @@
+# Palapa C2 @ 113.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# SCTV Jawa Timur
+S 3745000 H 3125000 3/4
+
+# SCTV
+S 3758000 H 4470000 3/4
+
+# TVRI Nasional
+S 3765000 H 5555000 3/4
+
+# RCTI
+S 3774000 H 6520000 3/4
+
+# KBS World Indonesia
+S 3836000 V 2097000 3/4
+
+# Bali TV
+S 3926000 H 4208000 3/4
+
+# TV One Indonesia
+S 4054000 H 5632000 3/4
+
+# ANTV Indonesia
+S 4055000 V 6510000 3/4
+
+# Indosiar
+S 4074000 V 6500000 3/4
+
+# Satelindo Multiplex
+S 4080000 H 28125000 3/4
+
+# TPI Indonesia
+S 4184000 V 6700000 3/4
diff --git a/util/scan/dvb-s/ST1_C-80.0E b/util/scan/dvb-s/ST1_C-80.0E
new file mode 100644
index 0000000..92d5b80
--- /dev/null
+++ b/util/scan/dvb-s/ST1_C-80.0E
@@ -0,0 +1,27 @@
+# ST1 @ 88.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# GTV Multiplex
+S 3469000 V 30000000 3/4
+
+# ABTV Multiplex
+S 3521000 H 8332000 5/6
+
+# Videoland Multiplex
+S 3550000 V 30000000 3/4
+
+# GTV Multiplex
+S 3595000 H 30000000 3/4
+
+# Videoland multiplex
+S 3632000 V 30000000 3/4
+
+# Chungwa Telecom
+S 3671000 H 9256000 3/4
+
+# NTD TV Asia-Pacific
+S 3689000 H 3000000 3/4
diff --git a/util/scan/dvb-s/Sirius-5.0E b/util/scan/dvb-s/Sirius-5.0E
index ec4e4ea..949d0e2 100644
--- a/util/scan/dvb-s/Sirius-5.0E
+++ b/util/scan/dvb-s/Sirius-5.0E
@@ -1,5 +1,62 @@
 # Sirius 5.0E
 # freq pol sr fec
+S 11215000 V 6666000 1/2
+S 11227000 H 23145000 3/4
+S 11247000 V 23145000 3/4
+S 11420000 H 23145000 3/4
+S 11727000 H 27500000 5/6
+S 11747000 V 27500000 3/4
+S 11766000 H 27500000 3/4
+S 11785000 V 27500000 3/4
+S 11804000 H 27500000 3/4
 S 11823000 V 27500000 3/4
+S 11843000 H 27500000 3/4
+S 11862000 V 27500000 3/4
+S 11881000 H 27500000 3/4
+S 11900000 V 27500000 3/4
+S 11919000 H 27500000 3/4
+S 11938000 V 27500000 3/4
+S 11958000 H 27500000 3/4
 S 11977000 V 27500000 3/4
+S 11996000 H 27500000 3/4
+S 12015000 V 27500000 5/6
+S 12034000 H 27500000 3/4
 S 12054000 V 27500000 3/4
+S 12073000 H 27500000 3/4
+S 12092000 V 27500000 3/4
+S 12111000 H 27500000 5/6
+S 12130000 V 27500000 3/4
+S 12149000 H 27500000 3/4
+S 12169000 V 27500000 3/4
+S 12188000 H 27500000 7/8
+S 12207000 V 27500000 3/4
+S 12226000 H 25540000 7/8
+S 12245000 V 27500000 3/4
+S 12265000 H 27500000 3/4
+S 12284000 V 27500000 3/4
+S 12303000 H 25547000 7/8
+S 12322000 V 27500000 3/4
+S 12341000 H 27500000 3/4
+S 12360000 V 27500000 7/8
+S 12379000 H 27500000 3/4
+S 12399000 V 27500000 2/3
+S 12418000 H 27500000 3/4
+S 12437000 V 27500000 2/3
+S 12456000 H 27500000 3/4
+S 12476000 V 27500000 3/4
+S 12608000 H 27500000 3/4
+S 12637000 H 14465000 3/4
+S 12668000 V 6666000 1/2
+S 12672000 H 3300000 3/4
+S 12674000 V 10000000 3/4
+S 12678000 V 13333000 5/6
+S 12680000 H 9404000 3/4
+S 12685000 V 4444000 3/4
+S 12690000 H 3330000 3/4
+S 12693000 V 3333000 5/6
+S 12701000 H 6111000 3/4
+S 12715000 H 3330000 3/4
+S 12718000 V 23500000 3/4
+S 12724000 H 1772000 3/4
+S 12728000 V 19720000 3/4
+S 12737000 V 6150000 3/4
diff --git a/util/scan/dvb-s/Telecom2-8.0W b/util/scan/dvb-s/Telecom2-8.0W
index 91678b4..5f48631 100644
--- a/util/scan/dvb-s/Telecom2-8.0W
+++ b/util/scan/dvb-s/Telecom2-8.0W
@@ -1,4 +1,17 @@
 # Telecom2 8.0W
 # freq pol sr fec
-S 11635000 H 6800000 5/6
-S 12687000 V 1879000 3/4
+S 10972000 V 27500000 3/4
+S 10974000 H 27500000 3/4
+S 11010000 H 27500000 3/4
+S 11011000 V 27500000 3/4
+S 11042000 H 7860000 3/4
+S 11053000 H 2850000 3/4
+S 11064000 H 12667000 3/4
+S 11387000 H 24740000 5/6
+S 11428000 H 27500000 3/4
+S 11500000 H 3460000 AUTO
+S 11554000 V 27500000 3/4
+S 11595000 V 27500000 3/4
+S 12545000 H 3038000 3/4
+S 12566000 V 27500000 3/4
+S 12649000 V 27500000 3/4
diff --git a/util/scan/dvb-s/Telkom1_C-108.0E b/util/scan/dvb-s/Telkom1_C-108.0E
new file mode 100644
index 0000000..f60c246
--- /dev/null
+++ b/util/scan/dvb-s/Telkom1_C-108.0E
@@ -0,0 +1,48 @@
+# Telkom 1 @ 108.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# Telkom Vision Multiplex
+S 3580000 H 28000000 3/4
+
+# Telkom Vision Multiplex
+S 3620000 H 28000000 3/4
+
+# Telkom Vision Multiplex
+S 3640000 V 28000000 3/4
+
+# TV Timor Leste
+S 3776000 H 4285000 3/4
+
+# TV Edukasi 1
+S 3785000 H 4000000 3/4
+
+# TVRI Kalbar
+S 3793000 H 3000000 3/4
+
+# TVRI Papua
+S 3797000 H 3900000 3/4
+
+# TV Edukasi 2
+S 3807000 H 4000000 3/4
+
+# Trans 7
+S 3990000 H 6000000 3/4
+
+# TVRI Aceh
+S 4015000 H 6000000 3/4
+
+# RCTI Jawa Timur
+S 4025000 H 3000000 3/4
+
+# Trans TV
+S 4084000 H 6000000 3/4
+
+# Papua TV
+S 4092000 H 3570000 3/4
+
+# JTV
+S 4097000 H 3125000 3/4
diff --git a/util/scan/dvb-s/Telstar-12-15.0W b/util/scan/dvb-s/Telstar-12-15.0W
deleted file mode 100644
index fb902ab..0000000
--- a/util/scan/dvb-s/Telstar-12-15.0W
+++ /dev/null
@@ -1,32 +0,0 @@
-# Telstar 12 @ 15.0W
-# freq pol sr fec
-
-S 12180000 H 03255000 AUTO
-S 11895000 V 05000000 AUTO
-S 11974000 V 03400000 AUTO
-S 12185000 H 04214000 AUTO
-S 12081000 H 03935000 AUTO
-S 12050000 V 03198000 AUTO
-S 11756000 H 06666000 AUTO
-S 12093000 V 02000000 AUTO
-S 11916000 H 06111000 AUTO
-S 11707000 H 03198000 AUTO
-S 11718000 V 05632000 AUTO
-S 11740000 V 03255000 AUTO
-S 12000000 H 06666000 AUTO
-S 12116000 H 02062000 AUTO
-S 12111000 H 02062000 AUTO
-S 12175000 H 03504000 AUTO
-S 12167000 H 03502000 AUTO
-S 12129000 V 02000000 AUTO
-S 12110000 V 06620000 AUTO
-S 11724000 H 13225000 AUTO
-S 11984000 H 13570000 AUTO
-S 12125000 H 03800000 AUTO
-S 11713000 V 09626000 AUTO
-S 11804000 V 07595000 AUTO
-S 11965000 H 14714000 AUTO
-S 12039000 V 05632000 AUTO
-S 12082000 V 06396000 AUTO
-S 12087000 V 03198000 AUTO
-S 12097000 V 03198000 AUTO
diff --git a/util/scan/dvb-s/Telstar10_C-76.5E b/util/scan/dvb-s/Telstar10_C-76.5E
new file mode 100644
index 0000000..36b0431
--- /dev/null
+++ b/util/scan/dvb-s/Telstar10_C-76.5E
@@ -0,0 +1,63 @@
+# Telstar 10 @ 76.5E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# Racing International
+S 3646000 H 5064000 3/4
+
+# Image Channel
+S 3655000 H 3214000 3/4
+
+# Globe Cast Asia multiplex
+S 3680000 H 27500000 3/4
+
+# UBI World TV Multiplex
+S 3760000 H 28066000 2/3
+
+# UBI World TV Multiplex
+S 3780000 V 28066000 2/3
+
+# Ekushey TV
+S 3787000 H 4600000 2/3
+
+# Diganta TV
+S 3793000 H 4340000 3/4
+
+# RRSat Global Network Multiplex
+S 3840000 H 27500000 3/4
+
+# Channel 1
+S 4003000 H 4080000 3/4
+
+# Boishakhi TV
+S 4009000 H 4300000 3/4
+
+# TV Maldives
+S 4030000 V 6312000 1/2
+
+# Channel I
+S 4034000 H 4300000 3/4
+
+# Bangla Vision
+S 4049000 H 3600000 3/4
+
+# Kantipur TV
+S 4056000 H 3214000 3/4
+
+# BBC World Service Multiplex
+S 4073000 H 13020000 1/2
+
+# MNC Indonesia
+S 4105000 H 3125000 3/4
+
+# NDTV Arabia
+S 4137000 H 2893000 3/4
+
+# Islamic TV
+S 4146000 H 3600000 3/4
+
+# Bangladesh Multiplex
+S 4173000 H 7400000 3/4
diff --git a/util/scan/dvb-s/Telstar12-15.0W b/util/scan/dvb-s/Telstar12-15.0W
index 529b91f..db14a6e 100644
--- a/util/scan/dvb-s/Telstar12-15.0W
+++ b/util/scan/dvb-s/Telstar12-15.0W
@@ -1,4 +1,26 @@
 # Telstar 12 15.0W
 # freq pol sr fec
-S 12041000 H 3256000 2/3
-S 12520000 V 8700000 1/2
+S 10988000 H 2893000 3/4
+S 10992000 H 2893000 3/4
+S 11060000 H 19279000 3/4
+S 11123000 V 19279000 3/4
+S 11124000 H 18386000 3/4
+S 11150000 H 18386000 3/4
+S 11150000 V 19279000 3/4
+S 11531000 H 3198000 7/8
+S 11566000 H 4284000 3/4
+S 11677000 V 2200000 1/2
+S 11709000 V 3195000 AUTO
+S 11806000 V 7596000 3/4
+S 11963000 H 14714000 3/4
+S 12082000 H 3935000 3/4
+S 12117000 H 4772000 AUTO
+S 12159000 H 7777000 2/3
+S 12166000 H 3503000 3/4
+S 12173000 H 3503000 3/4
+S 12524000 V 26470000 3/4
+S 12547000 H 11900000 2/3
+S 12589000 V 4503000 1/2
+S 12608000 H 19279000 2/3
+S 12615000 V 11939000 2/3
+S 12645000 H 3255000 3/4
diff --git a/util/scan/dvb-s/Telstar18_C-138.0E b/util/scan/dvb-s/Telstar18_C-138.0E
new file mode 100644
index 0000000..6bd70c6
--- /dev/null
+++ b/util/scan/dvb-s/Telstar18_C-138.0E
@@ -0,0 +1,18 @@
+# Telstar 18 @ 138.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# I-Sky-Net Multiplex
+S 3599000 V 30000000 3/4
+
+# I-Sky-Net Multiplex
+S 3660000 V 30000000 3/4
+
+# LNTV Laos
+S 3704000 V 3034000 3/4
+
+# BBC World Service Multiplex
+S 4124000 V 3255000 1/2
diff --git a/util/scan/dvb-s/Thaicom1A_C-120.0E b/util/scan/dvb-s/Thaicom1A_C-120.0E
new file mode 100644
index 0000000..1a9d11f
--- /dev/null
+++ b/util/scan/dvb-s/Thaicom1A_C-120.0E
@@ -0,0 +1,24 @@
+# Thaicom 1A @ 120.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# TV3 Cambodia
+S 3725000 V 3255000 3/4
+
+# Panyapiwat
+S 3745000 V 2850000 5/6
+
+# CTN Cambodia Multiplex
+S 3854000 V 9628000 3/4
+
+# Kasikorn TV
+S 3881000 V 2000000 3/4
+
+# Bayon TV
+S 3916000 V 3359000 3/4
+
+# Radio Thailand Multiplex
+S 4135000 V 1808000 3/4
diff --git a/util/scan/dvb-s/Thaicom2_C-78.5E b/util/scan/dvb-s/Thaicom2_C-78.5E
new file mode 100644
index 0000000..4e1fbcd
--- /dev/null
+++ b/util/scan/dvb-s/Thaicom2_C-78.5E
@@ -0,0 +1,33 @@
+# Thaicom 2 @ 78.5E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# BBTV Channel 7
+S 3764000 H 5900000 3/4
+
+# SBT TV
+S 3803000 H 1445000 7/8
+
+# MCOT Multiplex
+S 3888000 H 15625000 3/4
+
+# Royal Thai Army TV 5
+S 3905000 H 6250000 3/4
+
+# Thai TV Color Channel 3
+S 3967000 H 4551000 3/4
+
+# RU TV 1
+S 4003000 H 1085000 3/4
+
+# Ten TV & Rich Channel
+S 4016000 H 2305000 7/8
+
+# NBT TV
+S 4106000 H 4688000 3/4
+
+# Thai PBS
+S 4145000 H 4815000 3/4
diff --git a/util/scan/dvb-s/Thaicom5_C-78.5E b/util/scan/dvb-s/Thaicom5_C-78.5E
new file mode 100644
index 0000000..902ddac
--- /dev/null
+++ b/util/scan/dvb-s/Thaicom5_C-78.5E
@@ -0,0 +1,69 @@
+# Thaicom 5 @ 78.5E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# ETC India Multiplex
+S 3421000 V 6667000 3/4
+
+# Europe Media Port Multiplex
+S 3431000 H 13333000 3/4
+
+# Nepal TV Multiplex
+S 3432000 V 6667000 3/4
+
+# CTV9
+S 3448000 V 2222000 3/4
+
+# RRSat Global Network (MPEG-4 S/2)
+S 3450000 H 13333000 3/4
+
+# Avenues TV
+S 3454000 V 3333000 3/4
+
+# PSI Channel
+S 3460000 V 1538000 3/4
+
+# Sagarmatha TV
+S 3489000 V 3333000 3/4
+
+# Dhi TV
+S 3502000 V 4444000 2/3
+
+# Korean Central TV
+S 3504000 H 3367000 2/3
+
+# Gang Cartoon Channel
+S 3505000 V 1852000 3/4
+
+# Lao Star Channel
+S 3521000 V 2917000 3/4
+
+# Thaicom Multiplex
+S 3545000 V 30000000 5/6
+
+# RRSat Global Network
+S 3551000 H 13333000 3/4
+
+# VTV Maldives
+S 3562000 H 4444000 1/2
+
+# MRTV Multiplex
+S 3574000 H 7492000 2/3
+
+# Thaicom Multiplex
+S 3585000 V 26667000 3/4
+
+# Thaicom Multiplex
+S 3600000 H 26667000 3/4
+
+# MRTV Multiplex
+S 3617000 V 12500000 3/4
+
+# RRSat Global Network Multiplex
+S 3640000 H 28066000 3/4
+
+# TVK Cambodia
+S 3664000 H 3704000 3/4
diff --git a/util/scan/dvb-s/Thor-1.0W b/util/scan/dvb-s/Thor-1.0W
index 1f8f1d2..99e98d4 100644
--- a/util/scan/dvb-s/Thor-1.0W
+++ b/util/scan/dvb-s/Thor-1.0W
@@ -1,8 +1,36 @@
 # Thor 1.0W
 # freq pol sr fec
+S 11216000 V 24500000 7/8
+S 11229000 H 24500000 7/8
 S 11247000 V 24500000 7/8
+S 11261000 H 24500000 7/8
+S 11278000 V 24500000 7/8
 S 11293000 H 24500000 7/8
+S 11309000 V 24500000 7/8
 S 11325000 H 24500000 7/8
-S 12054000 H 28000000 7/8
+S 11325000 V 24500000 7/8
+S 11325000 V 24500000 7/8
+S 11341000 V 24500000 7/8
+S 11357000 H 24500000 7/8
+S 11372000 V 24500000 7/8
+S 11389000 H 24500000 7/8
+S 11403000 V 24500000 7/8
+S 11421000 H 24500000 7/8
+S 11434000 V 24500000 7/8
+S 11747000 H 28000000 5/6
+S 11785000 H 28000000 5/6
+S 11823000 H 28000000 7/8
+S 11938000 H 25000000 3/4
+S 12015000 H 30000000 3/4
+S 12130000 H 30000000 3/4
+S 12149000 V 28000000 5/6
 S 12169000 H 28000000 7/8
-S 12226000 V 28000000 7/8
+S 12188000 V 25000000 3/4
+S 12226000 V 28000000 3/4
+S 12245000 H 28000000 5/6
+S 12303000 V 28000000 5/6
+S 12322000 H 27800000 3/4
+S 12399000 H 28000000 7/8
+S 12418000 V 28000000 7/8
+S 12456000 V 28000000 3/4
+S 12476000 H 28000000 5/6
diff --git a/util/scan/dvb-s/Vinasat1_C-132.0E b/util/scan/dvb-s/Vinasat1_C-132.0E
new file mode 100644
index 0000000..4d611de
--- /dev/null
+++ b/util/scan/dvb-s/Vinasat1_C-132.0E
@@ -0,0 +1,12 @@
+# VINASAT 1 @ 132.0E C-BAND
+# Generated by Pietro Casoar
+# 1st March 2009
+
+# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
+# freq pol sr fec
+
+# VTV Multiplex (VTV 1, VTV 2, VTV 3, VTV 4, VTV6)
+S 3413000 V 9766000 3/4
+
+# VOV TV (Voice of VietNam)
+S 3529000 V 2500000 2/3
diff --git a/util/scan/dvb-t/au-AdelaideFoothills b/util/scan/dvb-t/au-AdelaideFoothills
new file mode 100644
index 0000000..466a354
--- /dev/null
+++ b/util/scan/dvb-t/au-AdelaideFoothills
@@ -0,0 +1,12 @@
+# Australia / Adelaide / Grenfell Street
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# ABC
+T 781625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Seven
+T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Nine
+T 795500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Ten
+T 732500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# SBS
+T 760500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-Bendigo b/util/scan/dvb-t/au-Bendigo
new file mode 100644
index 0000000..a5df229
--- /dev/null
+++ b/util/scan/dvb-t/au-Bendigo
@@ -0,0 +1,41 @@
+# Australia / Bendigo (Mt Alexandria transmitters)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# ABC
+T 669500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 572500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+
+# Seven
+T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 555250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+
+# Nine
+T 576250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+
+# Ten
+T 618250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+
+# SBS
+T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 634500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 534250000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+# UNK1
+T 676500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# UNK2
+T 571500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+
+T 536625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 585625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 543500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 536500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 529500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 205500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 536625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 550500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/au-Devonport b/util/scan/dvb-t/au-Devonport
new file mode 100644
index 0000000..4985f09
--- /dev/null
+++ b/util/scan/dvb-t/au-Devonport
@@ -0,0 +1,19 @@
+# Australia / Tasmania / Devonport
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# Brett S Hallett October 2009 , may not be complete !!
+#
+# ABC VHF 57
+T 730250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# ABC Digital 45
+T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# SBS VHF 54
+T 709250000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# SBS Digital 39
+T 606500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# SCTV
+T 613498000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# WIN
+T 627498000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
+# TDT
+T 585498000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-FraserCoast-Bundaberg b/util/scan/dvb-t/au-FraserCoast-Bundaberg
new file mode 100644
index 0000000..562fc34
--- /dev/null
+++ b/util/scan/dvb-t/au-FraserCoast-Bundaberg
@@ -0,0 +1,12 @@
+# Australia / QLD / Fraser Coast - Bundaberg / Mt Goonaneman
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# ABC VHF9A
+T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# SBS UHF28
+T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# Seven VHF7
+T 184625000 7MHz 2/3 NONE QAM64 8k 1/16 NONE
+# WIN Wide Bay VHF10
+T 212500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Southern Cross Ten VHF9
+T 198525000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/au-Goulburn-Rocky_Hill b/util/scan/dvb-t/au-Goulburn-Rocky_Hill
new file mode 100644
index 0000000..bff0dbe
--- /dev/null
+++ b/util/scan/dvb-t/au-Goulburn-Rocky_Hill
@@ -0,0 +1,19 @@
+# Australia / Goulburn / Rocky Hill
+#
+# Scanned 17/10/2009 - Alex Ferrara (alex@receptiveit.com.au)
+
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# ABC - netid (4112) tid (547) offset (+125Khz)
+T 725625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+
+# SBS - netid (12802) tid (848) offset (+125Khz)
+T 746625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+
+# WIN - netid (12915) tid (12922) offset (+125Khz)
+T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+
+# Prime - netid (12929) tid (2462) offset (+125Khz)
+T 788625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+
+# TEN - netid (12812) tid (2055) offset (0Khz)
+T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/au-Hervey_Bay-Ghost_Hill b/util/scan/dvb-t/au-Hervey_Bay-Ghost_Hill
new file mode 100644
index 0000000..04dee51
--- /dev/null
+++ b/util/scan/dvb-t/au-Hervey_Bay-Ghost_Hill
@@ -0,0 +1,16 @@
+# Australia / Hervey Bay / Ghost Hill
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# ABC UHF56
+T 725500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Seven UHF59
+T 746500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Nine UHF62
+T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Ten UHF68
+T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# SBS UHF28
+T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+# SBS UHF34
+T 704500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/au-Perth b/util/scan/dvb-t/au-Perth
index 1d6778d..48c046f 100644
--- a/util/scan/dvb-t/au-Perth
+++ b/util/scan/dvb-t/au-Perth
@@ -9,4 +9,4 @@ T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # Network TEN
 T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # SBS
-T 536500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 536625000 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
index 9fb17ef..c376678 100644
--- a/util/scan/dvb-t/au-SunshineCoast
+++ b/util/scan/dvb-t/au-SunshineCoast
@@ -3,7 +3,7 @@
 # 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
+T 662625000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
 # ABQ62 ABC ***
 T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
 # STQ65 7 ***
diff --git a/util/scan/dvb-t/au-Sutherland b/util/scan/dvb-t/au-Sutherland
new file mode 100644
index 0000000..6c21a73
--- /dev/null
+++ b/util/scan/dvb-t/au-Sutherland
@@ -0,0 +1,20 @@
+# Australia / Sutherland
+#
+# Australia modulation params:
+# - http://www.dba.org.au/index.asp?sectionID=120
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#
+# North (Broadcast Site Escarpment Road BROKERS NOSE)
+# - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+North
+#
+#Channel 7 stations
+T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+#Channel 9 bundle
+# T 191500000 7MHz AUTO AUTO AUTO AUTO AUTO AUTO
+#One and Channel 10
+T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+#Aunty
+T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+#SBS
+T 571500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/util/scan/dvb-t/be-Brussels b/util/scan/dvb-t/be-Brussels
index f81b83b..6998b48 100644
--- a/util/scan/dvb-t/be-Brussels
+++ b/util/scan/dvb-t/be-Brussels
@@ -1,5 +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
+T 754000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # RTBF
+T 746000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # BE-TV
+T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # VRT
diff --git a/util/scan/dvb-t/cz-All b/util/scan/dvb-t/cz-All
new file mode 100644
index 0000000..7c6d601
--- /dev/null
+++ b/util/scan/dvb-t/cz-All
@@ -0,0 +1,41 @@
+# Czech Republic, whole country
+# Created from http://www.digizone.cz/texty/mapy-pokryti-multiplex-1-ceska-televize/
+# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-2-radiokomunikace/
+# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-3-czech-digital-group/
+# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-4-telefonica-o2/
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 570000000 8MHz 2/3 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 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/cz-Brno b/util/scan/dvb-t/cz-Brno
deleted file mode 100644
index b82e108..0000000
--- a/util/scan/dvb-t/cz-Brno
+++ /dev/null
@@ -1,10 +0,0 @@
-# DVB-T Brno (Brno, Czech Republic)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# 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-Domazlice b/util/scan/dvb-t/cz-Domazlice
deleted file mode 100644
index c20f70a..0000000
--- a/util/scan/dvb-t/cz-Domazlice
+++ /dev/null
@@ -1,3 +0,0 @@
-# DVB-T Domažlice (Domažlice, Czech Republic)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 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
deleted file mode 100644
index 880db35..0000000
--- a/util/scan/dvb-t/cz-Klet
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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-Ostrava b/util/scan/dvb-t/cz-Ostrava
deleted file mode 100644
index d2ea69f..0000000
--- a/util/scan/dvb-t/cz-Ostrava
+++ /dev/null
@@ -1,3 +0,0 @@
-# DVB-T Ostrava (Ostrava, Czech Republic)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/cz-Plzen b/util/scan/dvb-t/cz-Plzen
deleted file mode 100644
index 0b916af..0000000
--- a/util/scan/dvb-t/cz-Plzen
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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
deleted file mode 100644
index 0d6721f..0000000
--- a/util/scan/dvb-t/cz-Praha
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Praha (Prague, Czech Republic)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-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-Baden-Wuerttemberg b/util/scan/dvb-t/de-Baden-Wuerttemberg
index 3e5bec2..4dff1fd 100644
--- a/util/scan/dvb-t/de-Baden-Wuerttemberg
+++ b/util/scan/dvb-t/de-Baden-Wuerttemberg
@@ -1,20 +1,19 @@
 # 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 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 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 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: SWR-BW, BR, hr, WDR
 T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: SWR-BW, BR, hr, WDR
 T 634000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH41: SWR-BW, BR, hr, WDR
 T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, arte, Phoenix, EinsPlus
+T 666000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH45: RTL, RTL II, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
 T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: SWR-BW, BR, hr, WDR
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: Das Erste, arte, Phoenix, EinsPlus
-                                            # CH50: SWR-BW, BR, hr, WDR
+T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # 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 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: 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
index 50229fd..07ceeb0 100644
--- a/util/scan/dvb-t/de-Bayern
+++ b/util/scan/dvb-t/de-Bayern
@@ -1,26 +1,26 @@
 # 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 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: BR, BRalpha, SWR, Das Erste
-                                            # CH25: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+                                            # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: BR, BRalpha, SWR, Das Erste
 T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: BR, BRalpha, SWR, Das Erste
-                                            # CH28: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+                                            # CH28: ZDF, 3sat, KiKa / ZDFneo, 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 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: RTL, RTL II, Super RTL, VOX
-                                            # CH34: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+                                            # CH34: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Das Erste, arte, Phoenix, EinsPlus
+T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: BR, BRalpha, SWR, Das Erste
 T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: BR, BRalpha, hr, mdr
                                             # 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 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: BR, BRalpha, hr, mdr
                                             # CH45: Das Erste, arte, Phoenix, EinsPlus
 T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: BR, BRalpha, SWR, Das Erste
@@ -28,13 +28,13 @@ T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: BR, BRalpha, SWR, Das Erste
 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 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Das Erste, arte, Phoenix, EinsPlus
 T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Pro7, Sat.1, Kabel1, N24
 T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: BR, BRalpha, SWR, Das Erste
-                                            # CH53: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
-T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: http://www.digitalfernsehen.de/news/news_769785.html
+                                            # CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: Das Erste, arte, Phoenix, EinsPlus
 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 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, Eurosport, MonaTV, Franken TV
 T 834000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH66: RTL, RTL II, Super RTL, VOX
-                                            # CH66: Tele 5, Eurosport, HSE 24, münchen.tv
+                                            # 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 86f875b..5b040c7 100644
--- a/util/scan/dvb-t/de-Berlin
+++ b/util/scan/dvb-t/de-Berlin
@@ -1,11 +1,12 @@
 # DVB-T Berlin
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz 3/4 NONE QAM16 8k 1/8 NONE # CH05: HSE 24/MONA, FAB, WDR, SWR
+T 177500000 7MHz 3/4 NONE QAM16 8k 1/8 NONE # CH05: Tele 5, HSE 24 / MonaTV(+ DMAX / Bibel.TV), WDR, SWR (BW / RP)
 T 191500000 7MHz 2/3 NONE QAM16 8k 1/8 NONE # CH07: MDR, NDR, arte
 T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH25: RTL, RTL II, Super RTL, VOX
 T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH27: Das Erste, RBB, Phoenix, EinsExtra
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH39: Das Vierte, Bibel.TV, QVC, TVP Polonia (ab Januar 2010)
 T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH44: Pro7, Sat.1, Kabel1, N24
 T 754000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH56: Eurosport, TV.B, DSF, Neun live
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH59: n-tv, EuroNews, + 26 Radioprogramme
+T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH59: n-tv, EuroNews / Channel 21 Shop, + 14 Radioprogramme
diff --git a/util/scan/dvb-t/de-Brandenburg b/util/scan/dvb-t/de-Brandenburg
index 3949267..9fc6ebe 100644
--- a/util/scan/dvb-t/de-Brandenburg
+++ b/util/scan/dvb-t/de-Brandenburg
@@ -1,7 +1,7 @@
 # DVB-T Brandenburg
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 730000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE # CH53: Das Erste, RBB, Phoenix, EinsExtra
 T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: MDR, NDR, arte
diff --git a/util/scan/dvb-t/de-Bremen b/util/scan/dvb-t/de-Bremen
index 7540bbf..9a79038 100644
--- a/util/scan/dvb-t/de-Bremen
+++ b/util/scan/dvb-t/de-Bremen
@@ -3,7 +3,7 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix
 T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL II, Super RTL, VOX
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, Neun live, Eurosport, MONA/DMAX
+T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, Neun live, Eurosport, MonaTV/ DMAX
 T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Pro7, Sat.1, Kabel1, N24
diff --git a/util/scan/dvb-t/de-Hamburg b/util/scan/dvb-t/de-Hamburg
index 4588748..f746043 100644
--- a/util/scan/dvb-t/de-Hamburg
+++ b/util/scan/dvb-t/de-Hamburg
@@ -1,16 +1,10 @@
 # DVB-T Hamburg
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH23: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR HH
 T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Pro7, Sat.1, Kabel1, N24
-T 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 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Neun live, HH1, Bibel.TV, Eurosport
 T 738000000 8MHz 1/2 NONE QAM64 8k 1/8 NONE # CH54: NDR HH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR SH
-T 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-Hessen b/util/scan/dvb-t/de-Hessen
index 7aa5d02..e4ad39c 100644
--- a/util/scan/dvb-t/de-Hessen
+++ b/util/scan/dvb-t/de-Hessen
@@ -2,18 +2,18 @@
 # 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 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: Phoenix, BR, SWR-RP, WDR
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: Das Erste, hr, EinsExtra/arte
 T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: RTL, RTL II, Super RTL, VOX
 T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: Das Erste, hr, EinsExtra/arte
 T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: Phoenix, BR, SWR-RP, mdr
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, hr, EinsExtra/arte
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: BR, hr, SWR-BW, WDR
 T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: Pro7, Sat.1, Kabel1, N24
 T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Phoenix, NDR, mdr, WDR
-T 818000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH64: Tele5, Eurosport, rheinmaintv
+T 818000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH64: Tele5, Eurosport, rheinmaintv, Bibel.TV
diff --git a/util/scan/dvb-t/de-Mecklenburg-Vorpommern b/util/scan/dvb-t/de-Mecklenburg-Vorpommern
index d1b0800..24e90ea 100644
--- a/util/scan/dvb-t/de-Mecklenburg-Vorpommern
+++ b/util/scan/dvb-t/de-Mecklenburg-Vorpommern
@@ -2,11 +2,11 @@
 # 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 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, 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
+T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
diff --git a/util/scan/dvb-t/de-Niedersachsen b/util/scan/dvb-t/de-Niedersachsen
index 7066933..636c1ec 100644
--- a/util/scan/dvb-t/de-Niedersachsen
+++ b/util/scan/dvb-t/de-Niedersachsen
@@ -5,21 +5,22 @@ T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: NDR NDS, WDR/NDR SH, MDR/NDR
 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 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: RTL, RTL II, Super RTL, VOX
-                                            # 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 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsExtra
+T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Tele 5, NICK / Comedy Central, Eurosport, MONA/DMAX
 T 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 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: 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 610000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH38: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 634000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH41: Das Erste, arte, Phoenix, EinsExtra
 T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL II, Super RTL, VOX
-                                            # CH42: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+                                            # CH42: ZDF, 3sat, KiKa / ZDFneo, 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
@@ -29,12 +30,10 @@ T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Das Erste, arte, Phoenix, Ei
 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
+                                            # CH59: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, NICK / Comedy Central, Eurosport, MONA/DMAX
 T 826000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH65: Das Erste, arte, Phoenix, EinsExtra
diff --git a/util/scan/dvb-t/de-Nordrhein-Westfalen b/util/scan/dvb-t/de-Nordrhein-Westfalen
index 4541df7..ec768a3 100644
--- a/util/scan/dvb-t/de-Nordrhein-Westfalen
+++ b/util/scan/dvb-t/de-Nordrhein-Westfalen
@@ -5,13 +5,13 @@ T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: Das Erste, arte, Phoenix, Ei
 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
+                                            # CH26: ZDF, 3sat, KiKa / ZDFneo, 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 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, 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 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: CNN, Eurosport, Tele5, VIVA
 T 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
@@ -23,5 +23,5 @@ 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 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsFestival
diff --git a/util/scan/dvb-t/de-Rheinland-Pfalz b/util/scan/dvb-t/de-Rheinland-Pfalz
index bf57d4d..a7d1d98 100644
--- a/util/scan/dvb-t/de-Rheinland-Pfalz
+++ b/util/scan/dvb-t/de-Rheinland-Pfalz
@@ -1,8 +1,8 @@
 # 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 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: SWR-RP, BR, hr, WDR
 T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, BR, hr, WDR
 T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Das Erste, arte, Phoenix, EinsPlus
diff --git a/util/scan/dvb-t/de-Saarland b/util/scan/dvb-t/de-Saarland
index 330075b..049ae71 100644
--- a/util/scan/dvb-t/de-Saarland
+++ b/util/scan/dvb-t/de-Saarland
@@ -1,7 +1,7 @@
 # DVB-T Saarland
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, 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
+T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Tele 5, QVC, Bibel.TV, freie Kapazität
diff --git a/util/scan/dvb-t/de-Sachsen b/util/scan/dvb-t/de-Sachsen
index 42e01eb..b3fcffd 100644
--- a/util/scan/dvb-t/de-Sachsen
+++ b/util/scan/dvb-t/de-Sachsen
@@ -2,11 +2,12 @@
 # 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 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, 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 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL II, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
 T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: MDR-SN, rbb, BR, WDR
 T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH32: MDR-SN, rbb, BR, WDR
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, 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
index ee59498..d8582f2 100644
--- a/util/scan/dvb-t/de-Sachsen-Anhalt
+++ b/util/scan/dvb-t/de-Sachsen-Anhalt
@@ -1,11 +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 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH24: Das Erste, arte, Phoenix, EinsFestival
+T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL II, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
 T 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 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 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
diff --git a/util/scan/dvb-t/de-Schleswig-Holstein b/util/scan/dvb-t/de-Schleswig-Holstein
index 7b544d6..18728e1 100644
--- a/util/scan/dvb-t/de-Schleswig-Holstein
+++ b/util/scan/dvb-t/de-Schleswig-Holstein
@@ -1,18 +1,18 @@
 # DVB-T Schleswig-Holstein
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / 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 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
+T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR HH
+T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsExtra
 T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR/NDR HH
 T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Pro7, Sat.1, Kabel1, N24
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfokanal
 T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
 T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: 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
+T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: Neun live, Tele 5, Eurosport, Bibel.TV
+T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Neun live, Tele 5, Eurosport, Bibel.TV
diff --git a/util/scan/dvb-t/de-Thueringen b/util/scan/dvb-t/de-Thueringen
index c159ea4..94bbf2c 100644
--- a/util/scan/dvb-t/de-Thueringen
+++ b/util/scan/dvb-t/de-Thueringen
@@ -2,9 +2,9 @@
 # Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH21: Das Erste, arte, Phoenix, EinsFestival
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFdokukanal, ZDFinfokanal
+T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, 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 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: ZDF, 3sat, KiKa / ZDFneo, 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/es-Albacete b/util/scan/dvb-t/es-Albacete
index 419156b..26b1e92 100644
--- a/util/scan/dvb-t/es-Albacete
+++ b/util/scan/dvb-t/es-Albacete
@@ -1,8 +1,10 @@
-# Spain, Albacete
+# Spain, Albacete - Update 2009/12/20 (Freud)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-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
+T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 39: La Regional, AB TeVe/TVCM, CRN, La Tribuna TV
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 47: CNC, Vision6, ABTeVe
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 59: La 1, La 2, 24H, Clan, RNE1, RNE Clásica, RNE 3
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 63: CMT, CMT2, RCM
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 66: Veo7, Sony TV en Veo, Tienda en Veo, Intereconomía, Teledeporte, Radio Intereconomía, Radio Marca, esRadio, Vaughan Radio
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 67: Cuatro, CNN+, 40 Latino, Canal Club, La Sexta, SER, 40 Principales, Cadena Dial
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, Punto Radio
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 69: Antena 3, Antena.Neox, Antena.Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía
diff --git a/util/scan/dvb-t/es-Alfabia b/util/scan/dvb-t/es-Alfabia
index dc2956c..a7e1a5a 100644
--- a/util/scan/dvb-t/es-Alfabia
+++ b/util/scan/dvb-t/es-Alfabia
@@ -1,5 +1,6 @@
 # DVB-T Alfabia, Mallorca, Balearic Islands, Spain.
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVM, Canal4, OnaMallorca Radio
 T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.63: 24h, 50 aniv., ClanTV, La 2, TVE1; RNE 1, RNE 3, RNE C; Digitext, EPG, Lanzadera.
 T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.65: IB3, Aprenda Ingles TV
 T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.66: NetTV, Teledeporte, VeoTV1, VeoTV2.
diff --git a/util/scan/dvb-t/es-BaixoMinho b/util/scan/dvb-t/es-BaixoMinho
new file mode 100644
index 0000000..6f6fde4
--- /dev/null
+++ b/util/scan/dvb-t/es-BaixoMinho
@@ -0,0 +1,16 @@
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20090528 1 0 OFDM ES </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Baixo Minho, Pontevedra (Spain)
+# date (yyyy-mm-dd)    : 2009-07-11
+# provided by (opt)    : neonmann@gmail.com
+#
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 834000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE      # SFN
+T 842000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE
+T 850000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE      # SFN
+T 858000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE
+T 770000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE      # RAR Pontevedra
+T 810000000 8MHz  2/3 NONE    QAM64   8k  1/4 NONE      # RGE GALICIA
diff --git a/util/scan/dvb-t/es-Collserola b/util/scan/dvb-t/es-Collserola
index bec8c8b..395bd16 100644
--- a/util/scan/dvb-t/es-Collserola
+++ b/util/scan/dvb-t/es-Collserola
@@ -1,10 +1,12 @@
 # DVB-T Collserola (Barcelona)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c26: BTV
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c33: CityTV
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c61: TV3, K3/33, 3/24, 300
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c26: BTV, TV Badalona, TV L'Hospitalet, TV del Besòs, COM Ràdio, Ràdio Ciutat Badalona, Ràdio L'Hospitalet
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c33: 8TV, Barça TV, EDC3, 105TV, RAC 1, RAC 105
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c43: TV3HD, 3/24, Canal 9, IB3, Catalunya Música, iCat FM
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c48: Urbe TV, Canal Català, 25 TV, Localia, Ona FM, Onda Rambla, Sensació Ràdio
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c61: TV3, 33, 3/24, K3/300, Catalunya Ràdio, Catalunya Informació
 T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c64: TVE1, TVE2, TVE 24H, Clan/TVE 50 Años, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c66: Veo TV, Veo2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c67: Cuatro, CNN+, 40 Latino, La Sexta1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c68: Telecino, T5 Sport, T5 Estrellas, Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c69: Antena 3, Antena.Neox, Antena.Nova, La Sexta2
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c66: Veo7, Sony TV en Veo, Tienda en Veo, Intereconomía, Teledeporte, Radio Intereconomía, Radio Marca
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c67: Cuatro, CNN+, 40 Latino, La Sexta, Ser, 40 Principales, Cadena Dial
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c68: Telecino, La Siete, FDF, CincoShop, Disney Channel, Punto Radio
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     #c69: Antena 3, Antena.Neox, Antena.Nova, Hogar 10, Onda Cero, Europa FM, Onda Melodía
diff --git a/util/scan/dvb-t/es-Granada b/util/scan/dvb-t/es-Granada
new file mode 100644
index 0000000..05847f1
--- /dev/null
+++ b/util/scan/dvb-t/es-Granada
@@ -0,0 +1,8 @@
+# Spain, Granada
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 762000000 8MHz 2/3 NONE 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
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/es-Huesca b/util/scan/dvb-t/es-Huesca
new file mode 100644
index 0000000..8079b83
--- /dev/null
+++ b/util/scan/dvb-t/es-Huesca
@@ -0,0 +1,8 @@
+# DVB-T Huesca (Aragón) [Spain] [es-Huesca]
+# Generated by Vicente Hernando Ara <bizenton@gmail.com>
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Canal 57: ARAGON TV, ARAGON RADIO, ARAGON HD
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE  # Canal 61: La 1, La 2, 24h, Clan, RNE1, RNEC, RNE3
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE  # Canal 66: Teledeporte, Canal Ingenieria, VEO7, SONY TV en VEO, Tienda en VEO, GUIDE PLUS+, Intereconomia, Radio Intereconomia, RADIO MARCA
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE  # Canal 67: laSexta, CUATRO, CNN+, 40 LATINO, PROMO, SER, 40 PRINCIPALES, CADENA DIAL
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE  # Canal 68: Telecinco, FDF, Telecinco 2, Disney Channel, Cincoshop
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE  # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, ONDA CERO, EUROPA FM, ONDA MELODÍA, HOGAR 10
diff --git a/util/scan/dvb-t/es-Muros-Noia b/util/scan/dvb-t/es-Muros-Noia
new file mode 100644
index 0000000..a02c31d
--- /dev/null
+++ b/util/scan/dvb-t/es-Muros-Noia
@@ -0,0 +1,9 @@
+# DVB-T Muros and Noia
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 27: Local Ribeira
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 61: RAR A Corunha
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 63: RGE Galicia
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 66: SFN 1
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 67: SFN 2
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 68: SFN 3
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 69: SFN 4
diff --git a/util/scan/dvb-t/es-Pamplona b/util/scan/dvb-t/es-Pamplona
new file mode 100644
index 0000000..4644b2d
--- /dev/null
+++ b/util/scan/dvb-t/es-Pamplona
@@ -0,0 +1,9 @@
+# DVB-T Pamplona
+# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
+T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 802000000 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
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/es-Santiago_de_Compostela b/util/scan/dvb-t/es-Santiago_de_Compostela
new file mode 100644
index 0000000..cf63e64
--- /dev/null
+++ b/util/scan/dvb-t/es-Santiago_de_Compostela
@@ -0,0 +1,9 @@
+# DVB-T Santiago de Compostela
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 23: Local Santiago
+T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 40: RAR Santiago
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 63: RGE Galicia
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 66: SFN 1
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 67: SFN 2
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 68: SFN 3
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE     # Canal 69: SFN 4
diff --git a/util/scan/dvb-t/es-Vitoria-Gasteiz b/util/scan/dvb-t/es-Vitoria-Gasteiz
new file mode 100644
index 0000000..5d97413
--- /dev/null
+++ b/util/scan/dvb-t/es-Vitoria-Gasteiz
@@ -0,0 +1,8 @@
+# Channel names in use at 2009/07/12, in Channel 66 [fffe] is a scrambled channel.
+# In the generated *channels.conf file could be necesary to change Intereconomía, Radio Intereconomía, ONDA MELODÍA to Intereconomia, Radio Intereconomia, ONDA MELODIA for Totem to work well.
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 58: ETB1, ETB2, ETB3, ETBSAT, Euskadi Irratia, Gaztea, EiTB Irratia, Radio Euskadi, Radio Vitoria
+T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 63: La 1, La 2, 24h, Clan, RNE1, RNEC, RNE3
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 66: Teledeporte, Canal Ingenieria, VEO7, SONY TV en VEO, Tienda en VEO, GUIDE PLUS+, Intereconomía, Radio Intereconomía, [fffe], RADIO MARCA
+T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 67: laSexta, CUATRO, CNN+, 40 LATINO, CANAL CLUB, SER, 40 PRINCIPALES, CADENA DIAL
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 68: Telecinco, FDF, LaSiete, Disney Channel, Cincoshop
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE    # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, ONDA CERO, EUROPA FM, ONDA MELODÍA, HOGAR 10
diff --git a/util/scan/dvb-t/fi-Smedsbole b/util/scan/dvb-t/fi-Smedsbole
new file mode 100644
index 0000000..fa9bc03
--- /dev/null
+++ b/util/scan/dvb-t/fi-Smedsbole
@@ -0,0 +1,13 @@
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20090808 2 0 OFDM FI </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Åland Smedsböle/Sund
+# date (yyyy-mm-dd)    : 2009-12-23
+# provided by (opt)    : k.hampf@gmail.com
+#
+# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Åland Network
+T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Åland Network
diff --git a/util/scan/dvb-t/fr-Laval b/util/scan/dvb-t/fr-Laval
index 61c0aa0..d97f04c 100644
--- a/util/scan/dvb-t/fr-Laval
+++ b/util/scan/dvb-t/fr-Laval
@@ -12,14 +12,14 @@
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 #### Laval - MontRochard ####
 #R1
-T 778000000 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 778166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #R2
-T 610000000 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 610166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #R3
-T 754000000 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 754166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #R4
-T 794000000 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 794166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #R5
-T 602000000 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 602166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 #R6
-T 802000000 8MHz AUTO NONE QAM64 8k AUTO NONE
+T 802166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/fr-Rochefort-sur-mer b/util/scan/dvb-t/fr-Rochefort-sur-mer
new file mode 100644
index 0000000..c32bc0d
--- /dev/null
+++ b/util/scan/dvb-t/fr-Rochefort-sur-mer
@@ -0,0 +1,14 @@
+# TNT à Rochefort (17)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+#multiplex 6 ( TF1 LCI Eurosport TF6 NRJ12 TMC )
+T 498166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+#multiplex 4 ( M6 W9 NT1 Paris Première ARTE HD )
+T 738166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+#multiplex 1 ( France 2 France 3 France 5 ARTE LCP Chaîne locale ou France Ô )
+T 602166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+
+#multiplex 2 ( Direct 8 France 4 BFM TV Virgin 17 Gulli i>Télé  )
+T 778167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/hr-All b/util/scan/dvb-t/hr-All
new file mode 100644
index 0000000..9a7223c
--- /dev/null
+++ b/util/scan/dvb-t/hr-All
@@ -0,0 +1,24 @@
+# Croatia, whole country
+# Created from http://www.hrt.hr/index.php?id=173&tx_ttnews[cat]=102&tx_ttnews[tt_news]=56725&tx_ttnews[backPid]=185&cHash=bdf5a53e91
+# and http://213.147.101.105/DVBT_MUXA_MUXB_Popis_odasiljackih_lokacija.html
+# and http://www.hrt.hr/index.php?id=173&tx_ttnews[cat]=102&tx_ttnews[tt_news]=7456&tx_ttnews[backPid]=185&cHash=d02ef00f9b
+# and http://www.oiv.hr/default.asp?ru=129&gl=200907100000002&sid=&jezik=0
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 490000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 682000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 690000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 778000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/hr-Zagreb b/util/scan/dvb-t/hr-Zagreb
deleted file mode 100644
index b385c87..0000000
--- a/util/scan/dvb-t/hr-Zagreb
+++ /dev/null
@@ -1,3 +0,0 @@
-# DVB-T Hamburg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 3/4 NONE AUTO 8k 1/32 NONE     # CH27:
diff --git a/util/scan/dvb-t/hu-Budapest b/util/scan/dvb-t/hu-Budapest
new file mode 100644
index 0000000..a697fda
--- /dev/null
+++ b/util/scan/dvb-t/hu-Budapest
@@ -0,0 +1,8 @@
+# Hungary / Budapest
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-55:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-62:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Debrecen b/util/scan/dvb-t/hu-Debrecen
new file mode 100644
index 0000000..29898d3
--- /dev/null
+++ b/util/scan/dvb-t/hu-Debrecen
@@ -0,0 +1,8 @@
+# Hungary / Debrecen
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-46:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 714000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-62:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Gyor b/util/scan/dvb-t/hu-Gyor
new file mode 100644
index 0000000..9650df5
--- /dev/null
+++ b/util/scan/dvb-t/hu-Gyor
@@ -0,0 +1,8 @@
+# Hungary / Gyor
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-42:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-61:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Kabhegy b/util/scan/dvb-t/hu-Kabhegy
new file mode 100644
index 0000000..7dfcecf
--- /dev/null
+++ b/util/scan/dvb-t/hu-Kabhegy
@@ -0,0 +1,8 @@
+# Hungary / Kabhegy
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# C.multiplex UHF-61:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# A2.multiplex UHF-64:
+# MTV-1 HD Sopron, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Kekes b/util/scan/dvb-t/hu-Kekes
new file mode 100644
index 0000000..76807df
--- /dev/null
+++ b/util/scan/dvb-t/hu-Kekes
@@ -0,0 +1,8 @@
+# Hungary / Kekes
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-44:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 658000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-69:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 858000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Kiskoros b/util/scan/dvb-t/hu-Kiskoros
new file mode 100644
index 0000000..edf3d90
--- /dev/null
+++ b/util/scan/dvb-t/hu-Kiskoros
@@ -0,0 +1,8 @@
+# Hungary / Kiskoros
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-45:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-68:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Nagykanizsa-Ujudvar b/util/scan/dvb-t/hu-Nagykanizsa-Ujudvar
new file mode 100644
index 0000000..35f23d9
--- /dev/null
+++ b/util/scan/dvb-t/hu-Nagykanizsa-Ujudvar
@@ -0,0 +1,8 @@
+# Hungary / Nagykanizsa / Ujudvar
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-24:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 498000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-65:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Pecs b/util/scan/dvb-t/hu-Pecs
new file mode 100644
index 0000000..caf7643
--- /dev/null
+++ b/util/scan/dvb-t/hu-Pecs
@@ -0,0 +1,8 @@
+# Hungary / Pecs
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-52:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-67:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 842000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Szeged b/util/scan/dvb-t/hu-Szeged
new file mode 100644
index 0000000..23f1c05
--- /dev/null
+++ b/util/scan/dvb-t/hu-Szeged
@@ -0,0 +1,8 @@
+# Hungary / Szeged
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-60:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-65:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Szentes b/util/scan/dvb-t/hu-Szentes
new file mode 100644
index 0000000..41b9225
--- /dev/null
+++ b/util/scan/dvb-t/hu-Szentes
@@ -0,0 +1,8 @@
+# Hungary / Szentes
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A3.multiplex UHF-60:
+# MTV-1 HD Szeged, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-65:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Tokaj b/util/scan/dvb-t/hu-Tokaj
new file mode 100644
index 0000000..6ef172a
--- /dev/null
+++ b/util/scan/dvb-t/hu-Tokaj
@@ -0,0 +1,8 @@
+# Hungary / Tokaj
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-68:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-63:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Uzd b/util/scan/dvb-t/hu-Uzd
new file mode 100644
index 0000000..c2d270e
--- /dev/null
+++ b/util/scan/dvb-t/hu-Uzd
@@ -0,0 +1,8 @@
+# Hungary / Uzd
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-52:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-67:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 842000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/hu-Vasvar-Hegyhatsal b/util/scan/dvb-t/hu-Vasvar-Hegyhatsal
new file mode 100644
index 0000000..4190e4d
--- /dev/null
+++ b/util/scan/dvb-t/hu-Vasvar-Hegyhatsal
@@ -0,0 +1,8 @@
+# Hungary / Vasvar / Hegyhatsal
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# A1.multiplex UHF-58:
+# MTV-1 HD Budapest, MTV-2 HD, ATV (Hungary), Hir TV, MR-1 Kossuth R, MR-2 Petofi R, MR-3 Bartok R, Katolikus R
+T 770000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+# C.multiplex UHF-68:
+# Duna TV HD, Duna-II. Autonomia, RTL Klub, TV-2 (Hungary), Euronews
+T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/it-Montevergine b/util/scan/dvb-t/it-Montevergine
new file mode 100644
index 0000000..0d7c30d
--- /dev/null
+++ b/util/scan/dvb-t/it-Montevergine
@@ -0,0 +1,18 @@
+# DVB-T Montevergine (Avellino) 83100
+# 12/12/2009 by Antonio Galasso anto1714@libero.it
+# (ricordati di mettere il lettore in posizione stop orima di iniziare la scansione dei canali)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# C-MUX
+T 177500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 482000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/lt-All b/util/scan/dvb-t/lt-All
new file mode 100644
index 0000000..daf2da2
--- /dev/null
+++ b/util/scan/dvb-t/lt-All
@@ -0,0 +1,39 @@
+# Lithuania, whole country
+# Created from http://www.skaitmenine.lt/lt/skaitmenine_tv_lietuvoje/antzemine_dvb_t.html
+# Created by baruse@gmail.com
+
+# LRTC I tinklas
+T 482000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 22
+T 514000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 26
+T 618000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 39
+T 658000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 44
+T 682000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 47
+T 762000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 57
+T 770000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 58
+T 786000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 60
+T 794000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 61
+
+# LRTC II tinklas
+T 570000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 33
+T 610000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 38
+T 690000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 48
+T 738000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 54
+T 802000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 62
+T 810000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 63
+T 818000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 64
+
+# TEO LT I tinklas
+T 594000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 36
+T 706000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 50
+T 778000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 59
+T 826000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 65
+
+# TEO LT II tinklas
+T 474000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 21
+T 546000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 30
+T 730000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 53
+#T 786000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 60
+
+# Vilniui bonusas
+T 602000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 37
+#T 730000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 53
diff --git a/util/scan/dvb-t/ro-Bucharest b/util/scan/dvb-t/ro-Bucharest
new file mode 100644
index 0000000..fac0ca9
--- /dev/null
+++ b/util/scan/dvb-t/ro-Bucharest
@@ -0,0 +1,5 @@
+# Romania / Bucharest
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 546000000 8MHz 2/3 NONE QAM16 8k 1/16 NONE
+T 738000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # SRTV
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # SNR DVB-T
diff --git a/util/scan/dvb-t/se-Ornskoldsvik_As b/util/scan/dvb-t/se-Ornskoldsvik_As
index e793d70..8fa6edb 100644
--- a/util/scan/dvb-t/se-Ornskoldsvik_As
+++ b/util/scan/dvb-t/se-Ornskoldsvik_As
@@ -4,3 +4,4 @@ T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/se-Skelleftea b/util/scan/dvb-t/se-Skelleftea
index 818beda..d831d9e 100644
--- a/util/scan/dvb-t/se-Skelleftea
+++ b/util/scan/dvb-t/se-Skelleftea
@@ -4,3 +4,4 @@ T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
 T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/util/scan/dvb-t/sk-BanskaBystrica b/util/scan/dvb-t/sk-BanskaBystrica
index 48d3170..80d73a2 100644
--- a/util/scan/dvb-t/sk-BanskaBystrica
+++ b/util/scan/dvb-t/sk-BanskaBystrica
@@ -1,4 +1,5 @@
 # DVB-T Banska Bystrica (Banska Bystrica, Slovak Republic)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# on channel 65
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Bardejov b/util/scan/dvb-t/sk-Bardejov
new file mode 100644
index 0000000..95daa9e
--- /dev/null
+++ b/util/scan/dvb-t/sk-Bardejov
@@ -0,0 +1,5 @@
+# DVB-T Bardejov (Bardejov, Slovak Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# on channel 62
+T 802000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Bratislava b/util/scan/dvb-t/sk-Bratislava
index 4924be4..57683a4 100644
--- a/util/scan/dvb-t/sk-Bratislava
+++ b/util/scan/dvb-t/sk-Bratislava
@@ -1,4 +1,5 @@
 # DVB-T Bratislava (Bratislava, Slovak Republic)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# on channel 66
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Kosice b/util/scan/dvb-t/sk-Kosice
index 46f7a7e..9046f28 100644
--- a/util/scan/dvb-t/sk-Kosice
+++ b/util/scan/dvb-t/sk-Kosice
@@ -1,4 +1,5 @@
 # DVB-T Kosice (Kosice, Slovak Republic)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+# on channel 64
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Michalovce b/util/scan/dvb-t/sk-Michalovce
new file mode 100644
index 0000000..f91b298
--- /dev/null
+++ b/util/scan/dvb-t/sk-Michalovce
@@ -0,0 +1,5 @@
+# DVB-T Michalovce (Michalovce, Slovak Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# on channel 64
+T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Namestovo b/util/scan/dvb-t/sk-Namestovo
new file mode 100644
index 0000000..da916ee
--- /dev/null
+++ b/util/scan/dvb-t/sk-Namestovo
@@ -0,0 +1,5 @@
+# DVB-T Namestovo (Namestovo, Slovak Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# on channel 68
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Poprad b/util/scan/dvb-t/sk-Poprad
new file mode 100644
index 0000000..74040ff
--- /dev/null
+++ b/util/scan/dvb-t/sk-Poprad
@@ -0,0 +1,5 @@
+# DVB-T Poprad (Poprad, Slovak Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# on channel 66
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-RimavskaSobota b/util/scan/dvb-t/sk-RimavskaSobota
new file mode 100644
index 0000000..6dfe7af
--- /dev/null
+++ b/util/scan/dvb-t/sk-RimavskaSobota
@@ -0,0 +1,5 @@
+# DVB-T Rimavska Sobota (Rimavska Sobota, Slovak Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# on channel 61
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Trencin b/util/scan/dvb-t/sk-Trencin
new file mode 100644
index 0000000..9a0d7c1
--- /dev/null
+++ b/util/scan/dvb-t/sk-Trencin
@@ -0,0 +1,5 @@
+# DVB-T Trencin (Trencin, Slovak Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# on channel 69
+T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-VelkyKrtis b/util/scan/dvb-t/sk-VelkyKrtis
new file mode 100644
index 0000000..90d186a
--- /dev/null
+++ b/util/scan/dvb-t/sk-VelkyKrtis
@@ -0,0 +1,5 @@
+# DVB-T Velky Krtis (Velky Krtis, Slovak Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# on channel 65
+T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/sk-Zilina b/util/scan/dvb-t/sk-Zilina
new file mode 100644
index 0000000..b1629b2
--- /dev/null
+++ b/util/scan/dvb-t/sk-Zilina
@@ -0,0 +1,5 @@
+# DVB-T Zilina (Zilina, Slovak Republic)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+
+# on channel 68
+T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/util/scan/dvb-t/uk-Redruth b/util/scan/dvb-t/uk-Redruth
index e8285a5..8f15fa0 100644
--- a/util/scan/dvb-t/uk-Redruth
+++ b/util/scan/dvb-t/uk-Redruth
@@ -2,9 +2,12 @@
 # Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
 # and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 666167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 521833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
 T 650167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 705833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 658167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/uk-StocklandHill b/util/scan/dvb-t/uk-StocklandHill
index c0d3c3e..f89a86d 100644
--- a/util/scan/dvb-t/uk-StocklandHill
+++ b/util/scan/dvb-t/uk-StocklandHill
@@ -1,10 +1,9 @@
 # UK, Stockland Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# http://www.ukfree.tv/txdetail.php?a=ST222014
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 481833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 529833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 505833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 561833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB1
+T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB2
+#T 538167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # PSB3 (DVB-T2)
+T 505833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM4
+T 481833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM5
+T 529833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE     # COM6
diff --git a/util/scan/dvb-t/uk-Storeton b/util/scan/dvb-t/uk-Storeton
index 1ca0841..8580aaa 100644
--- a/util/scan/dvb-t/uk-Storeton
+++ b/util/scan/dvb-t/uk-Storeton
@@ -2,9 +2,12 @@
 # Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
 # and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 490167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 514167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/uk-WinterHill b/util/scan/dvb-t/uk-WinterHill
index 3ea6abd..635f227 100644
--- a/util/scan/dvb-t/uk-WinterHill
+++ b/util/scan/dvb-t/uk-WinterHill
@@ -1,13 +1,9 @@
 # UK, Winter Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Populated by J. Hornsby from a scan of active multiplexes
+# UK, Winter Hill B Ceased broadcasting on 02 December 2009
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 850167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 842167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 810167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, Winter Hill B
-T 650000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 626000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 801833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/util/scan/dvb-t/vn-Hanoi b/util/scan/dvb-t/vn-Hanoi
new file mode 100644
index 0000000..451a07f
--- /dev/null
+++ b/util/scan/dvb-t/vn-Hanoi
@@ -0,0 +1,5 @@
+# Hanoi - Vietnam - DVB-T by VTC
+# contributed by Pham Thanh Nam <phamthanhnam.ptn@gmail.com>
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 514000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
diff --git a/util/scan/dvb-t/vn-Thaibinh b/util/scan/dvb-t/vn-Thaibinh
new file mode 100644
index 0000000..85f8098
--- /dev/null
+++ b/util/scan/dvb-t/vn-Thaibinh
@@ -0,0 +1,5 @@
+# Thaibinh - Vietnam - DVB-T by VTC
+# contributed by Pham Thanh Nam <phamthanhnam.ptn@gmail.com>
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 626000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
+T 634000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
diff --git a/util/scan/scan.c b/util/scan/scan.c
index 1b7a3e5..3058bdb 100644
--- a/util/scan/scan.c
+++ b/util/scan/scan.c
@@ -236,6 +236,17 @@ static struct transponder *find_transponder(uint32_t frequency)
 
 static void copy_transponder(struct transponder *d, struct transponder *s)
 {
+	struct list_head *pos;
+	struct service *service;
+
+	if (d->transport_stream_id != s->transport_stream_id) {
+		/* propagate change to any already allocated services */
+		list_for_each(pos, &d->services) {
+			service = list_entry(pos, struct service, list);
+			service->transport_stream_id = s->transport_stream_id;
+		}
+	}
+
 	d->network_id = s->network_id;
 	d->original_network_id = s->original_network_id;
 	d->transport_stream_id = s->transport_stream_id;
author	etobi <git@e-tobi.net>	2013-09-03 09:48:45 +0200
committer	etobi <git@e-tobi.net>	2013-09-03 09:48:45 +0200
commit	9fe4d4ea9c054e539ab679ed2e9c076c35beb69d (patch)
tree	affff927f15c8ae6c77890cc9564855efe2e51db /util/scan
parent	9a5228e0f2b898367b7943d294be58caf6ce8bb3 (diff)
download	linux-dvb-apps-upstream/1.1.1+rev1355.tar.gz