Merge tag 'upstream/0+git20150208.f2053b3'

Upstream version 0+git20150208.f2053b3

32 files changed, 483 insertions, 333 deletions

diff --git a/dvb-s/Astra-31.5E b/dvb-s/Astra-31.5E
deleted file mode 100644
index 31266ff..0000000
--- a/dvb-s/Astra-31.5E
+++ /dev/null
@@ -1,55 +0,0 @@
-# Astra 1G @ 31.5E
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11992000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 10
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11992000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 20
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 30
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 40
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12304500
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Atlantic-Bird-1-12.5W b/dvb-s/Atlantic-Bird-1-12.5W
index 383b122..0c85d50 100644
--- a/dvb-s/Atlantic-Bird-1-12.5W
+++ b/dvb-s/Atlantic-Bird-1-12.5W
@@ -1,5 +1,4 @@
 # Atlantic Bird 1 @ 12.5W
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
diff --git a/dvb-s/Atlantic-Bird-3-5.0W b/dvb-s/Atlantic-Bird-3-5.0W
index 2800188..9d751a7 100644
--- a/dvb-s/Atlantic-Bird-3-5.0W
+++ b/dvb-s/Atlantic-Bird-3-5.0W
@@ -1,5 +1,4 @@
 # Atlantic Bird 3 @ 5.0W
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS2
@@ -10,7 +9,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -22,7 +21,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 3
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -34,7 +33,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 11
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -46,7 +45,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 4
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -58,7 +57,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 5
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -70,7 +69,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 12
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -82,7 +81,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -94,7 +93,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -106,7 +105,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 3
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -118,7 +117,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 4
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -130,7 +129,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 5
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -142,7 +141,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 6
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -154,7 +153,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 7
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -166,7 +165,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 8
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -178,7 +177,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 9
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -190,7 +189,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 10
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -202,7 +201,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 11
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -214,7 +213,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 12
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -226,7 +225,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 13
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -238,7 +237,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 14
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -250,7 +249,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 15
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -262,7 +261,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 16
-	PLS CODE = 16416
+	PLS_CODE = 16416
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -274,7 +273,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -286,7 +285,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -298,7 +297,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -310,7 +309,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -322,8 +321,8 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 121212
-	PLS MODE = 1
+	PLS_CODE = 121212
+	PLS_MODE = 1
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -335,8 +334,8 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 121212
-	PLS MODE = 1
+	PLS_CODE = 121212
+	PLS_MODE = 1
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -348,7 +347,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -360,6 +359,6 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
diff --git a/dvb-s/Hotbird-13.0E b/dvb-s/Hotbird-13.0E
index c1759e0..0df0ab3 100644
--- a/dvb-s/Hotbird-13.0E
+++ b/dvb-s/Hotbird-13.0E
@@ -1,5 +1,4 @@
 # EUTELSAT SkyPlex, Hotbird 13E
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
@@ -266,30 +265,6 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11432000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 1
-	PLS CODE = 8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11432000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
-	ROLLOFF = AUTO
-	MODULATION = PSK/8
-	STREAM_ID = 2
-	PLS CODE = 8
-	INVERSION = AUTO
-
-[CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 11470000
 	POLARIZATION = VERTICAL
@@ -458,11 +433,27 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11919000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 2/3
+	ROLLOFF = AUTO
+	MODULATION = PSK/8
+	STREAM_ID = 1
+	PLS_CODE = 8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 11919000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
 	INNER_FEC = 2/3
+	ROLLOFF = AUTO
+	MODULATION = PSK/8
+	STREAM_ID = 2
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -690,7 +681,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 1
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -702,7 +693,7 @@
 	ROLLOFF = AUTO
 	MODULATION = PSK/8
 	STREAM_ID = 2
-	PLS CODE = 8
+	PLS_CODE = 8
 	INVERSION = AUTO
 
 [CHANNEL]
diff --git a/dvb-s/Intelsat-12-45.0E b/dvb-s/Intelsat-12-45.0E
index d98b9dd..124b0ec 100644
--- a/dvb-s/Intelsat-12-45.0E
+++ b/dvb-s/Intelsat-12-45.0E
@@ -1,5 +1,4 @@
 # Intelsat 12 @ 45.0E
-# std freq pol sr fec rolloff mod is_id pls_code pls_mode
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS2
diff --git a/dvb-s/Sirius-5.0E b/dvb-s/Sirius-5.0E
index e5d47b7..9f93c38 100644
--- a/dvb-s/Sirius-5.0E
+++ b/dvb-s/Sirius-5.0E
@@ -1,34 +1,59 @@
 # Sirius 5.0E
-# freq pol sr fec
+# automatically generated from kingofsat.net ini file 0048.ini
+# http://en.kingofsat.net/satellites.php
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11215000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11265000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11265000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = 1/2
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11227000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11305000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11247000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11305000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11420000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11345000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11345000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11385000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
@@ -217,7 +242,7 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12169000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
@@ -225,18 +250,28 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12188000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 7/8
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 10
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12188000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+	STREAM_ID = 20
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12207000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
@@ -285,23 +320,33 @@
 	FREQUENCY = 12322000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12341000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 30
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12341000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 40
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12360000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 7/8
+	INNER_FEC = 2/3
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -317,7 +362,7 @@
 	FREQUENCY = 12399000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -329,15 +374,15 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12437000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12456000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
@@ -353,6 +398,14 @@
 	INVERSION = AUTO
 
 [CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12575000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13922000
+	INNER_FEC = 1/2
+	INVERSION = AUTO
+
+[CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12608000
 	POLARIZATION = HORIZONTAL
@@ -370,113 +423,97 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12668000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = 1/2
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12672000
+	FREQUENCY = 12670000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 2600000
+	INNER_FEC = 2/3
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12674000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	FREQUENCY = 12680000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 9404000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12678000
+	FREQUENCY = 12682000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13333000
+	SYMBOL_RATE = 6888000
 	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12680000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12687000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9404000
+	SYMBOL_RATE = 5600000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12685000
+	FREQUENCY = 12687000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = 3/4
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12690000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 6667000
+	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12693000
+	FREQUENCY = 12694000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 3333000
 	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12701000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12702000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
+	SYMBOL_RATE = 2100000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12715000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
+	FREQUENCY = 12703000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2963000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12718000
+	FREQUENCY = 12719000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23500000
+	SYMBOL_RATE = 2960000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12724000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1772000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12722000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1600000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12728000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12725000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 19720000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 1480000
+	INNER_FEC = 8/9
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12737000
+	FREQUENCY = 12728000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6150000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 1600000
+	INNER_FEC = 2/3
 	INVERSION = AUTO
 
diff --git a/dvb-t/au-SunshineCoast b/dvb-t/au-SunshineCoast
index 5d22931..ff6f5dd 100644
--- a/dvb-t/au-SunshineCoast
+++ b/dvb-t/au-SunshineCoast
@@ -1,8 +1,8 @@
 # Australia / Sunshine Coast
-# SBS36 SBS ***
+# SBS40 SBS ***
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 585625000
+	FREQUENCY = 613500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -12,10 +12,10 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-# TNQ47 10 ***
+# TNQ44 10 ***
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 662625000
+	FREQUENCY = 641500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -25,10 +25,10 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-# ABQ62 ABC ***
+# ABC41 ABC ***
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 767625000
+	FREQUENCY = 620500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -38,10 +38,10 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-# STQ65 7 ***
+# STQ42 7 ***
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 788625000
+	FREQUENCY = 627500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -51,10 +51,10 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-# STQ68 WIN ***
+# RTQ43 WIN ***
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 809500000
+	FREQUENCY = 634500000
 	BANDWIDTH_HZ = 7000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
diff --git a/dvb-t/gr-Athens b/dvb-t/gr-Athens
index ff1db28..28e6c05 100644
--- a/dvb-t/gr-Athens
+++ b/dvb-t/gr-Athens
@@ -1,7 +1,51 @@
-# Initial scan config for Digital DVB-T (Ert) in Athens Greece
-[Digea DVB-T]
+# Initial scan config for DVB-T in Athens Greece
+# Created from the frequencies listed in
+# http://www.satspot.gr/television/channels/160-tv-sixnotites-attiki
+# and the actual service names for comments.
+
+# ART, ANT1, ALPHA, E
+[Digea 01]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 482000000
+	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
+
+# STAR, M.tv, SKAI, MEGA
+[Digea 02]
+	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
+
+# Vouli, Kosmos, N Plus, Deutero, N1, N HD, Trito, Proto
+[DT DIGITAL 01]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 474000000
+	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
+
+# DW, PROTO, KOSMOS, RIK, TRITO, TV 5, Europe, BBC World News
+[DT DIGITAL 02]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 674000000
+	FREQUENCY = 530000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -11,9 +55,10 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[Digea DVB-T]
+# BLUE SKY, ATTICA TV, AB CHANNEL, CHANNEL 9, ACTION24
+[MULTI ATTIKI 01]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 682000000
+	FREQUENCY = 666000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -23,9 +68,10 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
-[CHANNEL]
+# KONTRA, MAD TV, EXTRA CHANNEL, HIGH TV
+[MULTI ATTIKI 02]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 690000000
+	FREQUENCY = 722000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -35,3 +81,15 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+# NICKELODEON, SMILE, SBC, MTV GREECE
+[MULTI ATTIKI 03]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 738000000
+	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
diff --git a/dvb-t/ru-Krasnodar b/dvb-t/ru-Krasnodar
index c434a35..04a0fdb 100644
--- a/dvb-t/ru-Krasnodar
+++ b/dvb-t/ru-Krasnodar
@@ -24,30 +24,3 @@
 	HIERARCHY = NONE
 	STREAM_ID = 1
 	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 618000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 4/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = AUTO
-	HIERARCHY = NONE
-	STREAM_ID = 2
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 618000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 4/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = AUTO
-	HIERARCHY = NONE
-	STREAM_ID = 3
-	INVERSION = AUTO
-
diff --git a/dvb-t/ru-Novosibirsk b/dvb-t/ru-Novosibirsk
index 56e9e9d..3be3c33 100644
--- a/dvb-t/ru-Novosibirsk
+++ b/dvb-t/ru-Novosibirsk
@@ -24,30 +24,3 @@
 	HIERARCHY = NONE
 	STREAM_ID = 1
 	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 530000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 4/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = AUTO
-	HIERARCHY = NONE
-	STREAM_ID = 2
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 530000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 4/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = AUTO
-	HIERARCHY = NONE
-	STREAM_ID = 3
-	INVERSION = AUTO
-
diff --git a/dvb-t/ru-Volgodonsk b/dvb-t/ru-Volgodonsk
index 54b8674..6832d72 100644
--- a/dvb-t/ru-Volgodonsk
+++ b/dvb-t/ru-Volgodonsk
@@ -24,30 +24,3 @@
 	HIERARCHY = NONE
 	STREAM_ID = 1
 	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 650000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 4/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = AUTO
-	HIERARCHY = NONE
-	STREAM_ID = 2
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 650000000
-	BANDWIDTH_HZ = 8000000
-	CODE_RATE_HP = 4/5
-	CODE_RATE_LP = NONE
-	MODULATION = QAM/64
-	TRANSMISSION_MODE = 32K
-	GUARD_INTERVAL = AUTO
-	HIERARCHY = NONE
-	STREAM_ID = 3
-	INVERSION = AUTO
-
diff --git a/dvb-t/ua-Kharkov b/dvb-t/ua-Kharkov
index 13493b4..38c6b07 100644
--- a/dvb-t/ua-Kharkov
+++ b/dvb-t/ua-Kharkov
@@ -9,7 +9,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -22,7 +21,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -35,7 +33,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -48,6 +45,5 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
diff --git a/dvb-t/ua-Kiev b/dvb-t/ua-Kiev
index 0577625..6bf096b 100644
--- a/dvb-t/ua-Kiev
+++ b/dvb-t/ua-Kiev
@@ -9,7 +9,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -22,7 +21,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -35,7 +33,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -48,6 +45,5 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
diff --git a/dvb-t/ua-Lozovaya b/dvb-t/ua-Lozovaya
index fbd19f4..be7d9b9 100644
--- a/dvb-t/ua-Lozovaya
+++ b/dvb-t/ua-Lozovaya
@@ -9,7 +9,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -22,7 +21,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -35,7 +33,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -48,6 +45,5 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
diff --git a/dvb-t/ua-Odessa b/dvb-t/ua-Odessa
index 46c8571..16f00fa 100644
--- a/dvb-t/ua-Odessa
+++ b/dvb-t/ua-Odessa
@@ -9,7 +9,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -22,7 +21,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -35,7 +33,6 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -48,6 +45,5 @@
 	TRANSMISSION_MODE = 32K
 	GUARD_INTERVAL = 1/16
 	HIERARCHY = NONE
-	STREAM_ID = 4294967295
 	INVERSION = AUTO
 
diff --git a/dvb-t/uk-Angus b/dvb-t/uk-Angus
index 2a5064f..1127e36 100644
--- a/dvb-t/uk-Angus
+++ b/dvb-t/uk-Angus
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/DD4 0RQ/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Angus
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C60- BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C31 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C54 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 738000000
diff --git a/dvb-t/uk-BeaconHill b/dvb-t/uk-BeaconHill
index 3905ebf..549b3c9 100644
--- a/dvb-t/uk-BeaconHill
+++ b/dvb-t/uk-BeaconHill
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/TQ3 1RT/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Beacon Hill
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C60- BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C33 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C42 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 642000000
diff --git a/dvb-t/uk-BluebellHill b/dvb-t/uk-BluebellHill
index 32997e3..630ae75 100644
--- a/dvb-t/uk-BluebellHill
+++ b/dvb-t/uk-BluebellHill
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/ME5 9RD/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Bluebell Hill
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C46 BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C32 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C45 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 666000000
diff --git a/dvb-t/uk-Caldbeck b/dvb-t/uk-Caldbeck
index ad580f9..c75c3d2 100644
--- a/dvb-t/uk-Caldbeck
+++ b/dvb-t/uk-Caldbeck
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/CA7 8DW/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Caldbeck
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C25- BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C32 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C23- SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 489833000
diff --git a/dvb-t/uk-CaradonHill b/dvb-t/uk-CaradonHill
index 9facc28..e216aa5 100644
--- a/dvb-t/uk-CaradonHill
+++ b/dvb-t/uk-CaradonHill
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/PL14 5LT/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Caradon Hill
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C28+ BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C31 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C21+ SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 474167000
diff --git a/dvb-t/uk-Darvel b/dvb-t/uk-Darvel
index fb5ba0f..015f9ff 100644
--- a/dvb-t/uk-Darvel
+++ b/dvb-t/uk-Darvel
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/KA16 9LS/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Darvel
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C22- BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C31 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C23 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 490000000
diff --git a/dvb-t/uk-Durris b/dvb-t/uk-Durris
index 8cb94ec..7ecdc70 100644
--- a/dvb-t/uk-Durris
+++ b/dvb-t/uk-Durris
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/AB39 3TH/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Durris
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C28 BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C32 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C23 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 490000000
diff --git a/dvb-t/uk-Fenham b/dvb-t/uk-Fenham
index f3dea67..dd054f5 100644
--- a/dvb-t/uk-Fenham
+++ b/dvb-t/uk-Fenham
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/NE15 6PL/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Fenham
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C27 BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C31 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C25 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 506000000
diff --git a/dvb-t/uk-Fenton b/dvb-t/uk-Fenton
index 656ff48..8c0a543 100644
--- a/dvb-t/uk-Fenton
+++ b/dvb-t/uk-Fenton
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/ST4 2NX/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Fenton
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C24 BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C32 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C25 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 506000000
diff --git a/dvb-t/uk-Mendip b/dvb-t/uk-Mendip
index a7e34b6..8d3849b 100644
--- a/dvb-t/uk-Mendip
+++ b/dvb-t/uk-Mendip
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/BA5 3LB/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Mendip
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C49 BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C33 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 570000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C48 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 690000000
diff --git a/dvb-t/uk-MoelyParc b/dvb-t/uk-MoelyParc
index d74fd28..a2300b7 100644
--- a/dvb-t/uk-MoelyParc
+++ b/dvb-t/uk-MoelyParc
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/CH7 5UU/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Moel y Parc
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C45 BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C32 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C51- SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 713833000
diff --git a/dvb-t/uk-Oxford b/dvb-t/uk-Oxford
index 5579a48..1274349 100644
--- a/dvb-t/uk-Oxford
+++ b/dvb-t/uk-Oxford
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/OX3 9SS/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Oxford
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C53+ BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C31 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C50 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 706000000
@@ -79,3 +92,15 @@
 	STREAM_ID = 0
 	INVERSION = AUTO
 
+[C29 L-OFD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 538000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
diff --git a/dvb-t/uk-RidgeHill b/dvb-t/uk-RidgeHill
index a6ac23b..abb0971 100644
--- a/dvb-t/uk-RidgeHill
+++ b/dvb-t/uk-RidgeHill
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/HR8 2PG/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Ridge Hill
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C28 BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C32 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 562000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C21+ SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 474167000
diff --git a/dvb-t/uk-Rosneath b/dvb-t/uk-Rosneath
index d61d76c..cf006e7 100644
--- a/dvb-t/uk-Rosneath
+++ b/dvb-t/uk-Rosneath
@@ -2,8 +2,8 @@
 # Auto-generated from:
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/G84 0LF/NA/0/>
 #----------------------------------------------------------------------------------------------
-# location and provider: UK, Rosneath VP
-# date (yyyy-mm-dd)    : 2014-03-25
+# location and provider: UK, Rosneath
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C49 BBC A]
diff --git a/dvb-t/uk-Sheffield b/dvb-t/uk-Sheffield
index 4604ba1..cc31205 100644
--- a/dvb-t/uk-Sheffield
+++ b/dvb-t/uk-Sheffield
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/S10 5GL/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Sheffield
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C27 BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C31 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C42 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 642000000
@@ -79,3 +92,15 @@
 	STREAM_ID = 0
 	INVERSION = AUTO
 
+[C55 L-SFD]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 746000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/32
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
diff --git a/dvb-t/uk-StocklandHill b/dvb-t/uk-StocklandHill
index cbd1bf1..8b9ad5a 100644
--- a/dvb-t/uk-StocklandHill
+++ b/dvb-t/uk-StocklandHill
@@ -8,7 +8,7 @@
 #----------------------------------------------------------------------------------------------
 [C26+ BBC A]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 514167000
+	FREQUENCY = 514000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -20,7 +20,7 @@
 
 [C23+ D3&4]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 490167000
+	FREQUENCY = 490000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
@@ -32,7 +32,7 @@
 
 [C25- SDN]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 505833000
+	FREQUENCY = 506000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -44,7 +44,7 @@
 
 [C22- ARQ A]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 481833000
+	FREQUENCY = 482000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -56,7 +56,7 @@
 
 [C28- ARQ B]
 	DELIVERY_SYSTEM = DVBT
-	FREQUENCY = 529833000
+	FREQUENCY = 530000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 3/4
 	CODE_RATE_LP = NONE
@@ -68,7 +68,7 @@
 
 [C29+ BBC B HD]
 	DELIVERY_SYSTEM = DVBT2
-	FREQUENCY = 538167000
+	FREQUENCY = 538000000
 	BANDWIDTH_HZ = 8000000
 	CODE_RATE_HP = 2/3
 	CODE_RATE_LP = NONE
diff --git a/dvb-t/uk-Tacolneston b/dvb-t/uk-Tacolneston
index 5b7051b..1f664b8 100644
--- a/dvb-t/uk-Tacolneston
+++ b/dvb-t/uk-Tacolneston
@@ -3,7 +3,7 @@
 # <http://www.digitaluk.co.uk/coveragechecker/main/tradeexport/NR16 1DW/NA/0/>
 #----------------------------------------------------------------------------------------------
 # location and provider: UK, Tacolneston
-# date (yyyy-mm-dd)    : 2014-03-25
+# date (yyyy-mm-dd)    : 2015-01-17
 #
 #----------------------------------------------------------------------------------------------
 [C55- BBC A]
@@ -30,6 +30,19 @@
 	HIERARCHY = NONE
 	INVERSION = AUTO
 
+[C31 COM7 HD]
+	DELIVERY_SYSTEM = DVBT2
+	FREQUENCY = 554000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/256
+	TRANSMISSION_MODE = 32K
+	GUARD_INTERVAL = 1/128
+	HIERARCHY = NONE
+	STREAM_ID = 0
+	INVERSION = AUTO
+
 [C42 SDN]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 642000000