[dtv-scan-tables] 01/03: New upstream version 0+git20161227.ac7535a

Jonathan McCrohan jmccrohan-guest at moszumanska.debian.org
Thu Jan 5 16:01:33 UTC 2017


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

jmccrohan-guest pushed a commit to branch master
in repository dtv-scan-tables.

commit 0c34a5909320f924824d0402556780faba2127d1
Author: Jonathan McCrohan <jmccrohan at gmail.com>
Date:   Thu Jan 5 15:56:28 2017 +0000

    New upstream version 0+git20161227.ac7535a
---
 atsc/ca-ON-Toronto                   | 200 ++++++++++
 atsc/us-NTSC-center-frequencies      | 520 +++++++++++++++++++++++++
 atsc/us-NTSC-center-frequencies-8VSB | 410 --------------------
 dvb-c/cz-UPC                         |  58 +--
 dvb-c/de-Hessen-Unitymedia           | 343 ++++++++++++++++
 dvb-c/fi-Kaisa                       | 226 +++++++++++
 dvb-c/nl-Ziggo                       |  35 +-
 dvb-c/nl-upc                         |  14 -
 dvb-s/AMC10_C-135W                   |  21 +
 dvb-s/AMC11_C-131W                   |  30 ++
 dvb-s/AMC18_C-105W                   |  20 +
 dvb-s/AMC8_C-139W                    |  57 +++
 dvb-s/AMC9_C-83.0W                   |  49 +++
 dvb-s/Anik-F1R_C-107.3W              |  93 +++++
 dvb-s/Anik-F2_C-111.1W               |  12 +
 dvb-s/Galaxy13_C-127W                |  39 ++
 dvb-s/Galaxy14_C-125W                |  30 ++
 dvb-s/Galaxy15_C-133W                |  22 ++
 dvb-s/Galaxy16_C-99.0W               | 137 +++++++
 dvb-s/Galaxy17_C-91.0W               |  48 +++
 dvb-s/Galaxy19_C-97.0W               | 138 +++++++
 dvb-s/Galaxy23_C-121W                | 111 ++++++
 dvb-s/Galaxy28_C-89.0W               |  30 ++
 dvb-s/Galaxy3C_C-95.0W               |  29 ++
 dvb-s/Intelsat-805-55.5W             | 515 ------------------------
 dvb-s/Intelsat-9-58.0W               | 443 ---------------------
 dvb-s/Intelsat21_C-58.0W             | 273 +++++++++++++
 dvb-s/Intelsat34_C-55.5W             | 371 ++++++++++++++++++
 dvb-s/SES1_C-101W                    |  75 ++++
 dvb-s/SES2_C-87.0W                   |  66 ++++
 dvb-s/SES3_C-103W                    | 111 ++++++
 dvb-t/au-Goulburn-Rocky_Hill         | 683 +++++++++++++++++++++++++++++---
 dvb-t/es-Almeria                     | 108 ++++++
 dvb-t/es-Asturias                    | 145 ++++++-
 dvb-t/pl-Krosno_Sucha_Gora           |  35 ++
 dvb-t/pl-Warszawa                    |  64 +++
 dvb-t/ru-Vladivostok                 |  54 +++
 dvb-t/ru-all                         | 730 +++++++++++++++++++++++++++++++++++
 dvb-t/ug-All                         |  56 +--
 39 files changed, 4879 insertions(+), 1522 deletions(-)

diff --git a/atsc/ca-ON-Toronto b/atsc/ca-ON-Toronto
new file mode 100644
index 0000000..aa984e8
--- /dev/null
+++ b/atsc/ca-ON-Toronto
@@ -0,0 +1,200 @@
+#------------------------------------------------------------------------------
+# location			   : Toronto, ON, Canada
+# provider			   : OTA
+# date (yyyy-mm-dd)    : 2015-12-09
+# provided by (opt)    : maury.markowitz at gmail.com
+#------------------------------------------------------------------------------
+#
+# The following list are the main channels available in Toronto, including
+# both local channels as well as those from the US in the Buffalo area.
+# More distant stations like Rochester and Syracuse are listed below
+#
+#------------------------------------------------------------------------------
+# CFTO, Toronto CTV, physical channel 9, virtual channel 9, 17.4 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 9]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 189028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WUTV, Buffalo FOX, physical channel 14, virtual channel 29, 1000 kW, 981' tower, 43.025612 -78.928373
+[CHANNEL 14]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 473028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CHCH, Hamilton independent, physical channel 15, virtual channel 11, 132 kW, unknown tower, 43.207500 -79.774167
+[CHANNEL 15]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 479028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CICA, Toronto TVO, physical channel 19, virtual channel 19, 106.5 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 19]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 503028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CBLT, Toronto CBC, physical channel 20, virtual channel 5, 38 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 20]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 509028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CBLFT, Toronto CBC French, physical channel 25, virtual channel 25, 2.5 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 25]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 539028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WNLO, Buffalo CW, physical channel 32, virtual channel 23, 1000 kW, 994' tower, 43.030057 -78.920594
+[CHANNEL 32]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 581028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WGRZ, Buffalo NBC, physical channel 33, virtual channel 2, 480 kW, 968' tower, 42.718671 -78.562801
+[CHANNEL 33]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 587028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CHCJ, Hamilton CTV Two, physical channel 35, virtual channel 35, 390 kW, unknown tower, 43.231667 -79.859167
+[CHANNEL 35]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 599028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CITS, Hamilton CTS, physical channel 36, virtual channel 36, 5 kW, unknown tower, 43.207500 -79.774167
+[CHANNEL 36]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 605028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WKBW, Buffalo ABC, physical channel 38, virtual channel 7, 358 kW, 1420' tower, 42.637505 -78.619719
+[CHANNEL 38]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 611028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WIVB, Buffalo CBS, physical channel 39, virtual channel 4, 790 kW, 1368' tower, 42.659227 -78.625581
+[CHANNEL 39]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 623028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CJMT, Toronto Omni, physical channel 40, virtual channel 40, 19.5 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 40]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 629028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CIII, Toronto Global, physical channel 41, virtual channel 41, 38 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 41]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 635028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WNED, Buffalo PBS, physical channel 43, virtual channel 17, 473 kW, 1110' tower, 43.207500 -79.774167
+[CHANNEL 43]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 647028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CITY, Toronto independent, physical channel 44, virtual channel 57, 21 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 44]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 653028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CFMT, Toronto Omni 2, physical channel 47, virtual channel 47, 22.2 kW, 1611' CN tower, 43.642500 -79.387222
+[CHANNEL 47]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 671028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WNYO, Buffalo MyN, physical channel 49, virtual channel 49, 198 kW, 946' tower, 42.782838 -78.457521
+[CHANNEL 49]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 683028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#------------------------------------------------------------------------------
+#
+# The following stations are much more difficult to receive from the Toronto
+# area, either weaker transmitters, being at odd angles, or are further from
+# the Toronto area
+#
+#------------------------------------------------------------------------------
+
+# WBBZ, Buffalo MeTV, physical channel 7, virtual channel 67, 26.9 kW, unknown tower, 42.567839 -78.723083
+[CHANNEL 7]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 177028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CKVR, Barrie A, physical channel 10, virtual channel 10, 11 kW, 1611' CN tower, 44.351389 -79.698333
+[CHANNEL 10]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 195028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CHEX, Peterborough CBC, physical channel 12, virtual channel 12, 20 kW, unknown tower, 44.328056 -78.299444
+[CHANNEL 12]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 207028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WPXJ, Batavia ION, physical channel 23, virtual channel 51, 455 kW, unknown tower, 42.895061 -78.015288
+[CHANNEL 23]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 527028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# WYNB, Buffalo independent, physical channel 26, virtual channel 26, 243 kW, unknown tower, 42.393392 -79.228653
+[CHANNEL 26]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 545028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# CKVP, St. Catherine's TVO, physical channel 42, virtual channel 42, 11 kW, 496' tower, 43.051667 -79.300833
+[CHANNEL 42]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 641028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#------------------------------------------------------------------------------
+#
+# The following stations are NTSC analog
+#
+#------------------------------------------------------------------------------
+
+# CHEX, Courtice CBC, physical channel 22, virtual channel 22, 6 kW, unknown tower, 43.954167 -78.806389
+#[CHANNEL 22]
+#	DELIVERY_SYSTEM = ATSC
+#	FREQUENCY = 521028615
+#	MODULATION = VSB/8
+#	INVERSION = AUTO
diff --git a/atsc/us-NTSC-center-frequencies b/atsc/us-NTSC-center-frequencies
new file mode 100644
index 0000000..7d92c05
--- /dev/null
+++ b/atsc/us-NTSC-center-frequencies
@@ -0,0 +1,520 @@
+# US NTSC center frequencies
+# primarily of historical interest, many of these channels are no longer used
+#
+# see also: us-ATSC-center-frequencies-8VSB
+
+#
+# VHF low-band, channels 2 to 6, not used for digital
+#
+
+[CHANNEL 2]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 57028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 3]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 63028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 4]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 69028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 5]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 79028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 6]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 85028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#
+# VHF high-band, channels 7 to 13. not common but a few digital stations use it
+# potentially hard to receive because modern antennas are tuned for UHF
+#
+
+[CHANNEL 7]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 177028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 8]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 183028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 9]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 189028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 10]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 195028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 11]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 201028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 12]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 207028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 13]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 213028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#
+# UHF, channels 14 to 51, most existing stations, almost all digital
+#
+
+[CHANNEL 14]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 473028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 15]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 479028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 16]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 485028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 17]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 491028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 18]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 497028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 19]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 503028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 20]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 509028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 21]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 515028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 22]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 521028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 23]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 527028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 24]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 533028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 25]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 539028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 26]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 545028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 27]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 551028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 28]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 557028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 29]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 563028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 30]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 569028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 31]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 575028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 32]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 581028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 33]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 587028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 34]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 593028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 35]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 599028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 36]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 605028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#channel 37, not used in North America due to interference with radio astronomy bands
+[CHANNEL 37]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 611028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 38]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 617028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 39]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 623028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 40]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 629028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 41]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 635028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 42]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 641028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 43]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 647028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 44]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 653028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 45]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 659028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 46]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 665028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 47]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 671028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 48]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 677028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 49]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 683028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 50]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 689028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+#
+# the following frequencies were formerly part of the UHF band before the digital transition
+# but were sold off to cell carriers in 2010 as the 700 MHz band and are no longer used for television
+#
+
+#channel 51 was originally included in the digital transition but
+# no longer used to clear interference with 700 MHz cell bands
+[CHANNEL 51]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 695028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 52]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 701028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 53]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 707028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 54]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 713028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 55]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 719028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 56]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 725028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 57]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 731028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 58]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 737028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 59]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 743028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 60]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 749028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 61]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 755028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 62]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 761028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 63]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 767028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 64]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 773028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 65]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 779028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 66]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 785028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 67]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 791028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 68]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 797028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 69]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 803028615
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+# UHF formerly had channels 70 through 83 as well
+
+[CHANNEL 70]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 809000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 71]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 815000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 72]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 821000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 73]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 827000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 74]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 833000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 75]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 839000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 76]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 845000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 77]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 851000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 78]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 857000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 79]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 863000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 80]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 869000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 81]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 875000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 82]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 881000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
+[CHANNEL 83]
+	DELIVERY_SYSTEM = ATSC
+	FREQUENCY = 887000000
+	MODULATION = VSB/8
+	INVERSION = AUTO
+
diff --git a/atsc/us-NTSC-center-frequencies-8VSB b/atsc/us-NTSC-center-frequencies-8VSB
deleted file mode 100644
index 8f153af..0000000
--- a/atsc/us-NTSC-center-frequencies-8VSB
+++ /dev/null
@@ -1,410 +0,0 @@
-# US NTSC center frequencies, use if in doubt
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 57000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 63000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 69000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 79000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 85000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 177000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 183000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 189000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 195000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 201000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 207000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 213000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 473000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 479000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 485000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 491000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 497000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 503000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 509000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 515000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 521000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 527000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 533000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 539000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 545000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 551000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 557000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 563000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 569000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 575000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 581000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 587000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 593000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 599000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 605000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 611000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 617000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 623000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 629000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 635000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 641000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 647000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 653000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 659000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 665000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 671000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 677000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 683000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 689000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 695000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 701000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 707000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 713000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 719000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 725000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 731000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 737000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 743000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 749000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 755000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 761000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 767000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 773000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 779000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 785000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 791000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 797000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 803000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
diff --git a/dvb-c/cz-UPC b/dvb-c/cz-UPC
index cd7fd29..e02c5b8 100644
--- a/dvb-c/cz-UPC
+++ b/dvb-c/cz-UPC
@@ -1,12 +1,12 @@
 # UPC Česká republika | https://www.upc.cz/
 # Created from http://www.upczone.cz/download/seznam_muxu.htm
-# Last updated: 20/3/2016
+# Last updated: 15/10/2016
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 554000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/256
 	INVERSION = AUTO
 
@@ -14,7 +14,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 562000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/256
 	INVERSION = AUTO
 
@@ -22,7 +22,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 570000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/256
 	INVERSION = AUTO
 
@@ -30,7 +30,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 578000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/256
 	INVERSION = AUTO
 
@@ -38,7 +38,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 586000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/256
 	INVERSION = AUTO
 
@@ -46,7 +46,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 602000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/256
 	INVERSION = AUTO
 
@@ -54,7 +54,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 610000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/256
 	INVERSION = AUTO
 
@@ -62,7 +62,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 618000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/256
 	INVERSION = AUTO
 
@@ -70,7 +70,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 626000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -78,7 +78,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 634000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -86,7 +86,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 642000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -94,7 +94,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 650000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -102,7 +102,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 658000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -110,7 +110,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 666000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -118,7 +118,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 674000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -126,7 +126,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 682000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -134,7 +134,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 690000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -142,7 +142,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 698000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -150,7 +150,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 706000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -158,7 +158,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 714000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -166,7 +166,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 722000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -174,7 +174,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 730000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -182,7 +182,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 738000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -190,7 +190,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 746000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -198,7 +198,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 754000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -206,7 +206,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 762000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -214,7 +214,7 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 770000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
 
@@ -222,6 +222,6 @@
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
 	FREQUENCY = 778000000
 	SYMBOL_RATE = 6900000
-	INNER_FEC = AUTO
+	INNER_FEC = 3/5
 	MODULATION = QAM/64
 	INVERSION = AUTO
diff --git a/dvb-c/de-Hessen-Unitymedia b/dvb-c/de-Hessen-Unitymedia
new file mode 100644
index 0000000..807c443
--- /dev/null
+++ b/dvb-c/de-Hessen-Unitymedia
@@ -0,0 +1,343 @@
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 610000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 410000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 418000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 426000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 394000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 370000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 362000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 378000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 386000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 354000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 162000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 170000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 746000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 114000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 122000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 130000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 138000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 146000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 154000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 346000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 402000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 434000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 442000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 450000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 458000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 466000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 474000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 482000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 490000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 498000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 522000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 754000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 762000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 770000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 778000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 786000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 794000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 802000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 810000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 818000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 826000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 834000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 850000000
+	SYMBOL_RATE = 6900000
+	INNER_FEC = NONE
+	MODULATION = QAM/64
+	INVERSION = AUTO
diff --git a/dvb-c/fi-Kaisa b/dvb-c/fi-Kaisa
new file mode 100644
index 0000000..91b869e
--- /dev/null
+++ b/dvb-c/fi-Kaisa
@@ -0,0 +1,226 @@
+# Kaisanet Oy (Kajaani)
+# freq sr fec mod
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 170000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 370000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 362000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 354000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 346000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 146000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 338000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 322000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 314000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 162000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 308000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 154000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 290000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 308000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 282000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 274000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 266000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 250000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 258000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/256
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 330000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 186000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 194000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 202000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 210000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 218000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 226000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 378000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBC/ANNEX_A
+	FREQUENCY = 386000000
+	SYMBOL_RATE = 6875000
+	INNER_FEC = NONE
+	MODULATION = QAM/128
+	INVERSION = AUTO
+
diff --git a/dvb-c/nl-Ziggo b/dvb-c/nl-Ziggo
index dfbf304..88c8964 100644
--- a/dvb-c/nl-Ziggo
+++ b/dvb-c/nl-Ziggo
@@ -1,40 +1,15 @@
 # Initial Tuning file for nl-Ziggo
 # This file only lists the main
-# frequencies. You still need to do
+# frequencie. You still need to do
 # a network scan to find other
 # transponders.
+# Also set the network id
+# (aka nit other) to: 5555
 #
-# based on:
-# http://blob.ziggo.nl/dynamic/NL_HOME/PDF-UPLOAD/Gebruikers-Handleiding-DigitaleTV.pdf
-# Chapter 4
-#
-[Main Frequency Ziggo/Casema]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 372000000
-	SYMBOL_RATE = 6875000
-	INNER_FEC = NONE
-	MODULATION = QAM/64
-	INVERSION = AUTO
-
-[Main Frequency Ziggo/Multikabel]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 514000000
-	SYMBOL_RATE = 6875000
-	INNER_FEC = NONE
-	MODULATION = QAM/64
-	INVERSION = AUTO
-
-[Main Frequency Ziggo/@Home Zuid]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 356000000
-	SYMBOL_RATE = 6875000
-	INNER_FEC = NONE
-	MODULATION = QAM/64
-	INVERSION = AUTO
 
-[Main Frequency Ziggo/@Home Noord]
+[Main Frequency Ziggo]
 	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 369000000
+	FREQUENCY = 474000000
 	SYMBOL_RATE = 6875000
 	INNER_FEC = NONE
 	MODULATION = QAM/64
diff --git a/dvb-c/nl-upc b/dvb-c/nl-upc
deleted file mode 100644
index d14165c..0000000
--- a/dvb-c/nl-upc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Initial Tuning file for nl-UPC
-# This file only lists the main
-# frequencies. You still need to do
-# a network scan to find other
-# transponders.
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBC/ANNEX_A
-	FREQUENCY = 164000000
-	SYMBOL_RATE = 6900000
-	INNER_FEC = NONE
-	MODULATION = QAM/64
-	INVERSION = AUTO
-
diff --git a/dvb-s/AMC10_C-135W b/dvb-s/AMC10_C-135W
new file mode 100644
index 0000000..be36843
--- /dev/null
+++ b/dvb-s/AMC10_C-135W
@@ -0,0 +1,21 @@
+# AMC 10 @ 135W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3820000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29268000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3900000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29268000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
diff --git a/dvb-s/AMC11_C-131W b/dvb-s/AMC11_C-131W
new file mode 100644
index 0000000..6207d9b
--- /dev/null
+++ b/dvb-s/AMC11_C-131W
@@ -0,0 +1,30 @@
+# AMC 11 @ 131W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3820000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29726000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3860000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3928000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 14322000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
diff --git a/dvb-s/AMC18_C-105W b/dvb-s/AMC18_C-105W
new file mode 100644
index 0000000..09aacb6
--- /dev/null
+++ b/dvb-s/AMC18_C-105W
@@ -0,0 +1,20 @@
+# AMC 18 @ 105W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3780000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3760000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28068000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
diff --git a/dvb-s/AMC8_C-139W b/dvb-s/AMC8_C-139W
new file mode 100644
index 0000000..7a32adb
--- /dev/null
+++ b/dvb-s/AMC8_C-139W
@@ -0,0 +1,57 @@
+# AMC 8 @ 139W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4056000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13250000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3744000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2955000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3766000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3335000
+	INNER_FEC = 2/3
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4111000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7136000
+	INNER_FEC = 2/3
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4152000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 9259000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4170000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 10128000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
diff --git a/dvb-s/AMC9_C-83.0W b/dvb-s/AMC9_C-83.0W
new file mode 100644
index 0000000..3bb10bf
--- /dev/null
+++ b/dvb-s/AMC9_C-83.0W
@@ -0,0 +1,49 @@
+# AMC 9 @ 83W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3804000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4167000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3811000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2398000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3813000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2221000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3817000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2883000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3825000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4034000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+
diff --git a/dvb-s/Anik-F1R_C-107.3W b/dvb-s/Anik-F1R_C-107.3W
new file mode 100644
index 0000000..b9959b6
--- /dev/null
+++ b/dvb-s/Anik-F1R_C-107.3W
@@ -0,0 +1,93 @@
+# Anik F1R @ 107.3W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4000000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7856000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4080000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3807000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6499000
+	INNER_FEC = 1/2
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3824000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6500000
+	INNER_FEC = 1/2
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3914000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7078000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3928000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4020000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4060000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28348000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4100000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28348000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4140000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
diff --git a/dvb-s/Anik-F2_C-111.1W b/dvb-s/Anik-F2_C-111.1W
new file mode 100644
index 0000000..a9a838a
--- /dev/null
+++ b/dvb-s/Anik-F2_C-111.1W
@@ -0,0 +1,12 @@
+# Anik F2 @ 111.1W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4104000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4143000
+	INNER_FEC = 1/2
+	MODULATION = QPSK
+	INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy13_C-127W b/dvb-s/Galaxy13_C-127W
new file mode 100644
index 0000000..db85e25
--- /dev/null
+++ b/dvb-s/Galaxy13_C-127W
@@ -0,0 +1,39 @@
+# Galaxy 13 @ 127W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3780000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3820000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4066000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3313000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4185000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 10097000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy14_C-125W b/dvb-s/Galaxy14_C-125W
new file mode 100644
index 0000000..b7ffe0d
--- /dev/null
+++ b/dvb-s/Galaxy14_C-125W
@@ -0,0 +1,30 @@
+# Galaxy 14 @ 125W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3720000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 26668000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3760000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 19887000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3900000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29077000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy15_C-133W b/dvb-s/Galaxy15_C-133W
new file mode 100644
index 0000000..bcc096f
--- /dev/null
+++ b/dvb-s/Galaxy15_C-133W
@@ -0,0 +1,22 @@
+# GALAXY 15 @ 133W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3790000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 11935000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3809000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 16303000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+
diff --git a/dvb-s/Galaxy16_C-99.0W b/dvb-s/Galaxy16_C-99.0W
new file mode 100644
index 0000000..5d23c6f
--- /dev/null
+++ b/dvb-s/Galaxy16_C-99.0W
@@ -0,0 +1,137 @@
+# Galaxy 16 @ 99W C-BAND
+# freq pol sr fec
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3721000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 8703000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3789000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1671000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3795000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3255000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3805000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2300000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3810000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 8029000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3932000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1561000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3936000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1545000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4000000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 26398000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4080000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27780000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4120000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 9/10
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3740000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3812000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 15004000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4006000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5833000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4060000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27781000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4140000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 9/10
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy17_C-91.0W b/dvb-s/Galaxy17_C-91.0W
new file mode 100644
index 0000000..0530bc9
--- /dev/null
+++ b/dvb-s/Galaxy17_C-91.0W
@@ -0,0 +1,48 @@
+# Galaxy 17 @ 91W C-Band
+# freq pol sr fec
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3867000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6619000
+	INNER_FEC = 1/2
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3935000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2489000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3925000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4249000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3966000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5600000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4067000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6051000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+
diff --git a/dvb-s/Galaxy19_C-97.0W b/dvb-s/Galaxy19_C-97.0W
new file mode 100644
index 0000000..6d9f461
--- /dev/null
+++ b/dvb-s/Galaxy19_C-97.0W
@@ -0,0 +1,138 @@
+# Galaxy 19 @ 97W C-BAND
+# freq pol sr fec
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3940000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4070000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5499000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4100000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29862000
+	INNER_FEC = 9/10
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3760000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 31456000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3791000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 13332000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3814000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6373000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3847000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2200000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3851000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3532000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3856000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2940000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3922000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3703000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3984000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3599000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4060000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29858000
+	INNER_FEC = 9/10
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4080000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29858000
+	INNER_FEC = 9/10
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4120000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4160000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29862000
+	INNER_FEC = 9/10
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+
diff --git a/dvb-s/Galaxy23_C-121W b/dvb-s/Galaxy23_C-121W
new file mode 100644
index 0000000..f03b1df
--- /dev/null
+++ b/dvb-s/Galaxy23_C-121W
@@ -0,0 +1,111 @@
+# Galaxy 23 @ 121W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3840000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3877000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4444000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3892000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13020000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3910000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 14399000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4115000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 18086000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3780000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29269000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3980000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29270000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4032000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 8332000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4050000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2590000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4070000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6537000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4170000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 18915000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4190000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 11068000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy28_C-89.0W b/dvb-s/Galaxy28_C-89.0W
new file mode 100644
index 0000000..aba698d
--- /dev/null
+++ b/dvb-s/Galaxy28_C-89.0W
@@ -0,0 +1,30 @@
+# Galaxy 28 @ 89W  C-Band
+# 
+# freq pol sr fec
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3860000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3900000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29862000
+	INNER_FEC = 9/10
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3880000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 32364000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
diff --git a/dvb-s/Galaxy3C_C-95.0W b/dvb-s/Galaxy3C_C-95.0W
new file mode 100644
index 0000000..9c03c41
--- /dev/null
+++ b/dvb-s/Galaxy3C_C-95.0W
@@ -0,0 +1,29 @@
+# Galaxy 3C @ 95W C-BAND
+# freq pol sr fec
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3950000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 14999000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3776000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6923000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3824000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7500000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat-805-55.5W b/dvb-s/Intelsat-805-55.5W
deleted file mode 100644
index 8bfbdb6..0000000
--- a/dvb-s/Intelsat-805-55.5W
+++ /dev/null
@@ -1,515 +0,0 @@
-# Intelsat 805 @ 55.5W
-# freq pol sr fec
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4171000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4147000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3914000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1809000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3572000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4135000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3737000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1809000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3932000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3255000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3759000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4167000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3750000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3850000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4010000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3715000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3670000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1374000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4158000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1447000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3549000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6510000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3451000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3667000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3522000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4055000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 21703000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3698000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4119000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1631000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3446000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3675000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2660000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3717000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11574000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4030000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3767000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4427000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4027000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4089000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5540000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3685000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3751000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4127000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3980000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 19510000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3590000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10127000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4000000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3762000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3662000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3936000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3255000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3727000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4104000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5062000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3777000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3431000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3478000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4093000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2540000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3929000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2941000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4195000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4700000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4096000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5247000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3467000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4340000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3442000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4080000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4340000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4084000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10317000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3723000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3815000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 26667000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4006000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3918000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3735000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8680000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3727000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3940000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2575000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3792000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2244000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3900000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3612000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3677000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4232000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4127000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2532000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4152000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4177000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4111000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat-9-58.0W b/dvb-s/Intelsat-9-58.0W
deleted file mode 100644
index b076971..0000000
--- a/dvb-s/Intelsat-9-58.0W
+++ /dev/null
@@ -1,443 +0,0 @@
-# Intelsat 9 @ 58.0W
-# freq pol sr fec
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4122000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4146000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4157000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4160000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3960000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27684000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3720000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 19510000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4131000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4155000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4173000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3995000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3986000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4175000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4410000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4107000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8850000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3925000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3905000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3915000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3925000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4005000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4015000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3720000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27700000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4166000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3794000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3332000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3807000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3428000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3880000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3800000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 26470000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3760000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3996000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3935000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11852000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11895000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11913000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4155000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3310000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3934000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3787000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7407000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3924000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3800000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3911000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13330000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 16180000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4080000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4144000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2205000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4151000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4147000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2941000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4170000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2941000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3760000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11670000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 16470000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4125000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2941000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4137000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2941000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4174000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2941000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3840000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3840000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3815000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6250000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat21_C-58.0W b/dvb-s/Intelsat21_C-58.0W
new file mode 100644
index 0000000..8467159
--- /dev/null
+++ b/dvb-s/Intelsat21_C-58.0W
@@ -0,0 +1,273 @@
+# Intelsat 21 @ 58.0W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3720000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27000000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3760000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3785000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5199000
+	INNER_FEC = 9/10
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3791000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3329000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3840000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27690000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3880000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27690000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3920000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 9/10
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3952000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 15146000
+	INNER_FEC = 3/5
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3972000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4499000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4000000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28122000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4040000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 26591000
+	INNER_FEC = 1/2
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4080000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4125000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3700000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3720000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 8/9
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3760000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27690000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3800000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3840000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27690000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3880000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3910000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 14999000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3924000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6620000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3934000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7000000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3960000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4000000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4040000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4080000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27690000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4120000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27501000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4150000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4160000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2940000	
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4169000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4174000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2941000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
diff --git a/dvb-s/Intelsat34_C-55.5W b/dvb-s/Intelsat34_C-55.5W
new file mode 100644
index 0000000..0b20ffb
--- /dev/null
+++ b/dvb-s/Intelsat34_C-55.5W
@@ -0,0 +1,371 @@
+# Intelsat 34 @ 55.5W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3715000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 8890000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3725000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3746000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1600000
+	INNER_FEC = 3/5
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3754000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4232000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3757000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2967000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3763000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3776000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7999000
+	INNER_FEC = 3/5
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3797000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6670000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3845000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3872000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 9333000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3910000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5833000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3932000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5625000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3969000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7120000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4015000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4055000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4084000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 10560000
+	INNER_FEC = 3/5
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4097000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2272000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4100000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 1840000
+	INNER_FEC = 3/5
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4106000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5360000
+	INNER_FEC = 3/5
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4111000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4000000
+	INNER_FEC = 3/5
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4120000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5499000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4134000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4444000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4136000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2000000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4142000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5000000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4147000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3443000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4151000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2500000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4160000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5599000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3805000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 26664000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3840000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 26700000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3884000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3926000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 7199000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3987000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3329000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3990000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3590000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4002000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 8681000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4020000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 18401000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4085000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4074000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4092000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3616000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4100000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2319000
+	INNER_FEC = 8/9
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4111000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1850000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4136000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4177000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
diff --git a/dvb-s/SES1_C-101W b/dvb-s/SES1_C-101W
new file mode 100644
index 0000000..0dbb860
--- /dev/null
+++ b/dvb-s/SES1_C-101W
@@ -0,0 +1,75 @@
+# SES 1 @ 101.0W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4020000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28000000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3715000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4775000
+	INNER_FEC = 3/5
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3720000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 10000000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3773000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4441000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3952000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2734000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3956000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2734000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3960000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2734000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3973000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5924000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
diff --git a/dvb-s/SES2_C-87.0W b/dvb-s/SES2_C-87.0W
new file mode 100644
index 0000000..c19372f
--- /dev/null
+++ b/dvb-s/SES2_C-87.0W
@@ -0,0 +1,66 @@
+# SES 2 @ 87.0W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3842000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6149000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4000000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29123000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4043000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4710000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3743000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 5000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3752000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 8681000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3948000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 4164000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3953000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2500000
+	INNER_FEC = 3/4
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
diff --git a/dvb-s/SES3_C-103W b/dvb-s/SES3_C-103W
new file mode 100644
index 0000000..2a0d413
--- /dev/null
+++ b/dvb-s/SES3_C-103W
@@ -0,0 +1,111 @@
+# SES 3 @ 103W C-BAND
+# freq pol sr fec
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3840000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 26682000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3903000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6511000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3912000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2927000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3920000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3149000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 3923000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2733000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4000000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 29271000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4040000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 2/3
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3740000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 29268000
+	INNER_FEC = 7/8
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3971000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 14800000
+	INNER_FEC = 5/6
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4020000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3499000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4090
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 14029000
+	INNER_FEC = 3/4
+	MODULATION = QPSK
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 4140000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 5/6
+	MODULATION = PSK/8
+	INVERSION = AUTO
+
diff --git a/dvb-t/au-Goulburn-Rocky_Hill b/dvb-t/au-Goulburn-Rocky_Hill
index 2165655..259d9ea 100644
--- a/dvb-t/au-Goulburn-Rocky_Hill
+++ b/dvb-t/au-Goulburn-Rocky_Hill
@@ -1,73 +1,664 @@
 # Australia / Goulburn / Rocky Hill
 #
-# Scanned 17/10/2009 - Alex Ferrara (alex at receptiveit.com.au)
+# Scanned 31/07/2016 - Alex Ferrara (alex at receptiveit.com.au)
 
-# ABC - netid (4112) tid (547) offset (+125Khz)
-[CHANNEL]
+[Nine Canberra]
+	SERVICE_ID = 2055
+	VIDEO_PID = 353
+	AUDIO_PID = 354
+	PID_0b = 8026
+	PID_06 = 355
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[9HD Canberra]
+	SERVICE_ID = 2247
+	VIDEO_PID = 1761
+	AUDIO_PID = 1762 1763 8025
+	PID_0b = 8026
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[Nine Canberra]
+	SERVICE_ID = 2215
+	VIDEO_PID = 353
+	AUDIO_PID = 354
+	PID_0b = 8026
+	PID_06 = 355
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[9Gem]
+	SERVICE_ID = 2087
+	VIDEO_PID = 1711
+	AUDIO_PID = 1712
+	PID_0b = 8026
+	PID_06 = 1713
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[9Go!]
+	SERVICE_ID = 2119
+	VIDEO_PID = 1721
+	AUDIO_PID = 1722
+	PID_0b = 8026
+	PID_06 = 1723
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[9Life]
+	SERVICE_ID = 2279
+	VIDEO_PID = 1771
+	AUDIO_PID = 1772
+	PID_0b = 8026
+	PID_06 = 1773
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[YESSHOP]
+	SERVICE_ID = 2151
+	VIDEO_PID = 1731
+	AUDIO_PID = 1732
+	PID_0b = 8026
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[Aspire]
+	SERVICE_ID = 2183
+	VIDEO_PID = 1741
+	AUDIO_PID = 1742
+	PID_0b = 8026
+	PID_05 = 8025
+	FREQUENCY = 641500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra]
+	SERVICE_ID = 1921
+	VIDEO_PID = 122
+	AUDIO_PID = 522
+	PID_0b = 102
+	PID_06 = 722
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra HD]
+	SERVICE_ID = 1939
+	VIDEO_PID = 125
+	AUDIO_PID = 525 725
+	PID_0b = 102
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ONE Canberra]
+	SERVICE_ID = 1922
+	VIDEO_PID = 123
+	AUDIO_PID = 523
+	PID_0b = 102
+	PID_06 = 723
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ELEVEN Canberra]
+	SERVICE_ID = 1926
+	VIDEO_PID = 124
+	AUDIO_PID = 524
+	PID_0b = 102
+	PID_06 = 724
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[WIN NETWORK]
+	SERVICE_ID = 1936
+	VIDEO_PID = 126
+	AUDIO_PID = 526
+	PID_0b = 102
+	PID_06 = 726
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[TVSN]
+	SERVICE_ID = 1928
+	VIDEO_PID = 116
+	AUDIO_PID = 516
+	PID_0b = 102
+	PID_06 = 716
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[GOLD]
+	SERVICE_ID = 1927
+	VIDEO_PID = 115
+	AUDIO_PID = 515
+	PID_0b = 102
+	PID_06 = 715
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ONE Canberra]
+	SERVICE_ID = 1925
+	VIDEO_PID = 123
+	AUDIO_PID = 523
+	PID_0b = 102
+	PID_06 = 723
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[WIN Canberra]
+	SERVICE_ID = 1924
+	VIDEO_PID = 122
+	AUDIO_PID = 522
+	PID_0b = 102
+	PID_06 = 722
+	FREQUENCY = 634500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 725625000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+
+[PRIME7 Canberra]
+	SERVICE_ID = 2374
+	VIDEO_PID = 2740
+	AUDIO_PID = 2741
+	PID_0b = 2749
+	PID_06 = 2745
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[PRIME7 Canberra]
+	SERVICE_ID = 2400
+	VIDEO_PID = 2740
+	AUDIO_PID = 2741
+	PID_0b = 2749
+	PID_06 = 2745
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
+[PRIME7 Canberra]
+	SERVICE_ID = 2401
+	VIDEO_PID = 2740
+	AUDIO_PID = 2741
+	PID_0b = 2749
+	PID_06 = 2745
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
-# SBS - netid (12802) tid (848) offset (+125Khz)
-[CHANNEL]
+[7TWO Canberra]
+	SERVICE_ID = 2402
+	VIDEO_PID = 4620
+	AUDIO_PID = 4621
+	PID_0b = 2749
+	PID_06 = 4625
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 746625000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 2/3
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/8
+
+[7mate Canberra]
+	SERVICE_ID = 2403
+	VIDEO_PID = 4630
+	AUDIO_PID = 4632 4635
+	PID_0b = 2749
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ishoptv]
+	SERVICE_ID = 2405
+	VIDEO_PID = 4650
+	AUDIO_PID = 4651
+	PID_0b = 2749
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[RACING.COM]
+	SERVICE_ID = 2408
+	VIDEO_PID = 4680
+	AUDIO_PID = 4681
+	PID_0b = 2749
+	FREQUENCY = 627500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ABC News 24]
+	SERVICE_ID = 672
+	VIDEO_PID = 516
+	AUDIO_PID = 654 580 5500
+	PID_0b = 5501 5000
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ABC]
+	SERVICE_ID = 673
+	VIDEO_PID = 512
+	AUDIO_PID = 650
+	PID_0b = 5501 5000
+	PID_06 = 576
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ABC2/KIDS]
+	SERVICE_ID = 674
+	VIDEO_PID = 513
+	AUDIO_PID = 651
+	PID_0b = 5501 5000
+	PID_06 = 577
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
+[ABC]
+	SERVICE_ID = 675
+	VIDEO_PID = 512
+	AUDIO_PID = 650
+	PID_0b = 5501 5000
+	PID_06 = 576
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
-# WIN - netid (12915) tid (12922) offset (+125Khz)
-[CHANNEL]
+[ABC3]
+	SERVICE_ID = 676
+	VIDEO_PID = 514
+	AUDIO_PID = 652
+	PID_0b = 5501 5000
+	PID_06 = 578
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 767625000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+
+[Double J]
+	SERVICE_ID = 678
+	AUDIO_PID = 690
+	PID_0b = 5501
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[ABC Jazz]
+	SERVICE_ID = 679
+	AUDIO_PID = 700
+	PID_0b = 5501
+	PID_05 = 5500
+	FREQUENCY = 620500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
+[SBS ONE]
+	SERVICE_ID = 849
+	VIDEO_PID = 161
+	AUDIO_PID = 81
+	PID_0b = 7000 5000
+	PID_06 = 41
+	PID_05 = 7849
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
-# Prime - netid (12929) tid (2462) offset (+125Khz)
-[CHANNEL]
+[SBS HD]
+	SERVICE_ID = 853
+	VIDEO_PID = 102
+	AUDIO_PID = 103
+	PID_0b = 7000 5000
+	PID_06 = 43
+	PID_05 = 7853
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 788625000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+
+[SBS TWO]
+	SERVICE_ID = 850
+	VIDEO_PID = 162
+	AUDIO_PID = 83
+	PID_0b = 7000 5000
+	PID_06 = 42
+	PID_05 = 7850
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[Food Network]
+	SERVICE_ID = 851
+	VIDEO_PID = 163
+	AUDIO_PID = 85
+	PID_0b = 7000 5000
+	PID_06 = 44
+	PID_05 = 7849
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
+[NITV]
+	SERVICE_ID = 852
+	VIDEO_PID = 164
+	AUDIO_PID = 87
+	PID_0b = 7000 5000
+	PID_06 = 45
+	PID_05 = 7852
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
-# TEN - netid (12812) tid (2055) offset (0Khz)
-[CHANNEL]
+[SBS Radio 1]
+	SERVICE_ID = 862
+	AUDIO_PID = 201
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 809500000
-	BANDWIDTH_HZ = 7000000
-	CODE_RATE_HP = 3/4
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/16
+
+[SBS Radio 2]
+	SERVICE_ID = 863
+	AUDIO_PID = 202
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
+	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
 	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
+
+[SBS Radio 3]
+	SERVICE_ID = 864
+	AUDIO_PID = 203
+	FREQUENCY = 613500000
+	MODULATION = QAM/256
+	BANDWIDTH_HZ = 0
 	INVERSION = AUTO
+	CODE_RATE_HP = NONE
+	CODE_RATE_LP = AUTO
+	GUARD_INTERVAL = 1/32
+	TRANSMISSION_MODE = 2K
+	HIERARCHY = NONE
+	DELIVERY_SYSTEM = DVBT
 
diff --git a/dvb-t/es-Almeria b/dvb-t/es-Almeria
new file mode 100644
index 0000000..a6481e6
--- /dev/null
+++ b/dvb-t/es-Almeria
@@ -0,0 +1,108 @@
+# Spain, Almeria - Update 2016/03/17 (denise_amiga)
+[Canal 34: Interalmeria TV, 8TV, Tubienstar Astrocanal, Canal 28]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 36: Atreseries HD, Energy HD, Real Madrid TV]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 38: Boing, Energy, Mega, 13TV, Onda Cero, Europa FM, Melodia FM, Cope]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 41: Antena 3, Antena 3HD, laSexta, laSecta HD, Neox, Nova]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 44: Telecinco, Telecinco HD, Cuatro, Cuatro HD, FDF, Divinity]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 47: TDP, TDP HD 9Kiss TV, 10, Radio Clasica HQ, Radio 3 HQ, Radio Exterior RNE Kiss FM, Canal Ingenieria]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 57: La 1, La 1 HD, La 2, 24h, Clan, Radio, Radio 5]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 58: 13TV, Discovery MAX, Disney Channel, Paramount Channel, Cope, Radio Maria, Radio Marca, Vaughan Radio, esRadio, Guide Plus+]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 59: Canal Sur, Canal Sur 2, Andalucia TV, EHS TV, Canal Sur Radio, Flamenco Radio, Canal Fiesta Radio, Radio Andalucia Informacion]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
diff --git a/dvb-t/es-Asturias b/dvb-t/es-Asturias
index f163d4b..283b912 100644
--- a/dvb-t/es-Asturias
+++ b/dvb-t/es-Asturias
@@ -1,7 +1,7 @@
 # DVB-T Asturias
-[TPA TPA2]
+[Canal 22: Atreseries HD, Energy HD, Real Madrid TV, Be Mad]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 786000000
+	FREQUENCY = 482000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -11,9 +11,10 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[TVE 1, TVE 2, 24H TVE, CLAN/50 TVE, RNE1, RNE CLASICA, RNE3]
+# START CANGAS DE NARCEA Y LLANES
+[Canal 25: Ed. Prensa Asturiana, TeleNarcea, TeleAvilés, UTE Opalo]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 818000000
+	FREQUENCY = 506000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -22,10 +23,11 @@
 	GUARD_INTERVAL = 1/4
 	HIERARCHY = NONE
 	INVERSION = AUTO
+# END CANGAS DE NARCEA Y LLANES
 
-[TELEDEPORTE, VEO TV, VEO 2, NET TV]
+[Canal 27: Boing, Energy, Mega, 13 TV, Onda Cero, Europa FM, Melodía FM, Cope]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 834000000
+	FREQUENCY = 522000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -35,9 +37,9 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[CUATRO, CNN+, 40 LATINO, LA SEXTA 1]
+[Canal 28: Telecinco, Telecinco HD, Cuatro, Cuatro HD, FDF, Divinity]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 842000000
+	FREQUENCY = 530000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -47,9 +49,9 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[TELECINCO, T5 ESTRELLAS, T5 SPORT, FLYMUSIC]
+[Canal 32: Antena 3, Antena 3 HD, laSexta, laSexta HD, Neox, Nova]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 850000000
+	FREQUENCY = 562000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -59,9 +61,9 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2]
+[Canal 35: Proximamente, Discovery Max, Disney Channel, Paramount Channel, Cope, Radio María, Radio Marca, Vaughan Radio, esRadio]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 858000000
+	FREQUENCY = 586000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -71,3 +73,122 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+# START GIJÓN
+[Canal 38: Muy Muy TV, Canal 10, Astrocanal]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END GIJÓN
+
+[Canal 39: La 1, La 1 HD, La 2, 24h, Clan, Radio Nacional, Radio 5]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Canal 42: TDP, TDP HD, KISS, TEN, Radio Clásica HQ, Radio 3 HQ, Radio Exterior RNE, Kiss FM]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# START OVIEDO
+[Canal 43: Ed. Prensa Asturiana, Oviedo TV, Canal 10]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END OVIEDO
+
+# START INFIESTO
+[Canal 44: Ed. Prensa Asturiana, TeleAvilés, UTE Opalo]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END INFIESTO
+
+[Canal 45: TPA7, TPA8, TPA HD, RPA, Radio Langreo]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# START MIERES
+[Canal 46: Cuencas Mineras TV, Producciones Grela]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END MIERES
+
+# START AVILÉS
+[Canal 47: Ed. Prensa Asturiana, Canal 10, TeleAvilés]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END AVILÉS
+
+# START LUARCA-VALDÉS
+[Canal 56: Ed. Prensa Asturiana, TeleAvilés, ORT]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+# END LUARCA-VALDÉS
diff --git a/dvb-t/pl-Krosno_Sucha_Gora b/dvb-t/pl-Krosno_Sucha_Gora
new file mode 100644
index 0000000..cb4e92d
--- /dev/null
+++ b/dvb-t/pl-Krosno_Sucha_Gora
@@ -0,0 +1,35 @@
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
diff --git a/dvb-t/pl-Warszawa b/dvb-t/pl-Warszawa
new file mode 100644
index 0000000..e6c6b3e
--- /dev/null
+++ b/dvb-t/pl-Warszawa
@@ -0,0 +1,64 @@
+# Warsaw (Masowian), Poland
+#
+# Channels info: http://sat-charts.eu/dvb-t.php
+#
+[Raszyn/PKiN MUX-3]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Raszyn/PKiN MUX-8 (TVNHD)]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/16
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Raszyn/PKiN MUX-1]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[Raszyn/PKiN MUX-2]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+[PKiN MUX-8]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 191500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 5/6
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/4
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
diff --git a/dvb-t/ru-Vladivostok b/dvb-t/ru-Vladivostok
new file mode 100644
index 0000000..997838f
--- /dev/null
+++ b/dvb-t/ru-Vladivostok
@@ -0,0 +1,54 @@
+# Channel ranges for DVB-T2 in Vladivostok - Russia
+# Contributed by: Придворов Андрей "(Pridvorov Andrey)" <ua0lnj at bk.ru>
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 1
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 2
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
diff --git a/dvb-t/ru-all b/dvb-t/ru-all
new file mode 100644
index 0000000..070355f
--- /dev/null
+++ b/dvb-t/ru-all
@@ -0,0 +1,730 @@
+# Channel ranges for DVB-T2 in Russia
+# Contributed by: Придворов Андрей "(Pridvorov Andrey)" <ua0lnj at bk.ru>
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 178000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 186000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 194000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 202000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 210000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 218000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 226000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 474000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 482000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 490000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 498000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 506000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 514000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 522000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 530000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 546000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 586000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 594000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 602000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 610000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 618000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 626000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 642000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 650000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 658000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 666000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 674000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 682000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 698000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 706000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 714000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 722000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 738000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 754000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 762000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 770000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 778000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 786000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 794000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 802000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 810000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 818000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 826000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 834000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 842000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 850000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 858000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/AUTO
+	TRANSMISSION_MODE = AUTO
+	GUARD_INTERVAL = AUTO
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
diff --git a/dvb-t/ug-All b/dvb-t/ug-All
index ce2a286..2d29959 100644
--- a/dvb-t/ug-All
+++ b/dvb-t/ug-All
@@ -1,45 +1,55 @@
 # location and provider	: Kampala-Uganda
-# date			: 2013-11-01
+# date			: 2016-10-07
 # provided by		: Joseph Zikusooka
 # 	               	: http://joseph.zikusooka.com
-# 	               	: joseph at zikusooka.com
+# 	               	: josephzik at gmail.com
 #
 #------------------------------------------------------------------------------
-[UCC Primary]
-	DELIVERY_SYSTEM = DVBT
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
 	FREQUENCY = 474000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 2/3
+	CODE_RATE_HP = 1/2
 	CODE_RATE_LP = NONE
 	MODULATION = QPSK
-	TRANSMISSION_MODE = 8K
-	GUARD_INTERVAL = 1/4
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 538000000
+	FREQUENCY = 594000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = AUTO
-	CODE_RATE_LP = AUTO
-	MODULATION = QAM/AUTO
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = 1/16
-	HIERARCHY = AUTO
-	STREAM_ID = 1
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 586000000
+	FREQUENCY = 714000000
 	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = AUTO
-	CODE_RATE_LP = AUTO
-	MODULATION = QAM/AUTO
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = 1/16
-	HIERARCHY = AUTO
-	STREAM_ID = 9
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 730000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 1/2
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 2K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/dtv-scan-tables.git



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