aboutsummaryrefslogtreecommitdiffstats
path: root/dvb-t
diff options
context:
space:
mode:
authorChristoph Pfister <pfister@linuxtv.org>2008-02-12 18:01:37 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-02-12 18:01:37 +0100
commit8532ac8a8789050c8aae5187177fa3298cf77809 (patch)
tree94a31c96e3c8fe45785762be03c580225eaf21f0 /dvb-t
parentfab758e0b33f65c3dcb0f6cd65722f515383494f (diff)
downloaddtv-scan-tables-8532ac8a8789050c8aae5187177fa3298cf77809.tar.gz
add / update scan files for uk-*
Diffstat (limited to '')
-rw-r--r--dvb-t/uk-Aberdare10
-rw-r--r--dvb-t/uk-Angus17
-rw-r--r--dvb-t/uk-BeaconHill10
-rw-r--r--dvb-t/uk-Belmont10
-rw-r--r--dvb-t/uk-Bilsdale11
-rw-r--r--dvb-t/uk-BlackHill11
-rw-r--r--dvb-t/uk-Blaenplwyf4
-rw-r--r--dvb-t/uk-BluebellHill16
-rw-r--r--dvb-t/uk-Bressay10
-rw-r--r--dvb-t/uk-BrierleyHill10
-rw-r--r--dvb-t/uk-BristolIlchesterCres10
-rw-r--r--dvb-t/uk-BristolKingsWeston10
-rw-r--r--dvb-t/uk-Bromsgrove10
-rw-r--r--dvb-t/uk-BrougherMountain10
-rw-r--r--dvb-t/uk-Caldbeck9
-rw-r--r--dvb-t/uk-Caradon5
-rw-r--r--dvb-t/uk-CaradonHill11
-rw-r--r--dvb-t/uk-Carmel10
-rw-r--r--dvb-t/uk-Chatton10
-rw-r--r--dvb-t/uk-Chesterfield10
-rw-r--r--dvb-t/uk-Craigkelly17
-rw-r--r--dvb-t/uk-CrystalPalace19
-rw-r--r--dvb-t/uk-Darvel10
-rw-r--r--dvb-t/uk-Divis12
-rw-r--r--dvb-t/uk-Dover26
-rw-r--r--dvb-t/uk-DoverB8
-rw-r--r--dvb-t/uk-Durris23
-rw-r--r--dvb-t/uk-Eitshal10
-rw-r--r--dvb-t/uk-EmleyMoor16
-rw-r--r--dvb-t/uk-Fenham10
-rw-r--r--dvb-t/uk-Fenton10
-rw-r--r--dvb-t/uk-Ferryside8
-rw-r--r--dvb-t/uk-Guildford11
-rw-r--r--dvb-t/uk-Hannington9
-rw-r--r--dvb-t/uk-Hastings27
-rw-r--r--dvb-t/uk-Heathfield11
-rw-r--r--dvb-t/uk-HemelHempstead10
-rw-r--r--dvb-t/uk-HuntshawCross13
-rw-r--r--dvb-t/uk-Idle10
-rw-r--r--dvb-t/uk-KeelylangHill10
-rw-r--r--dvb-t/uk-Keighley10
-rw-r--r--dvb-t/uk-KilveyHill10
-rw-r--r--dvb-t/uk-KnockMore10
-rw-r--r--dvb-t/uk-Lancaster10
-rw-r--r--dvb-t/uk-LarkStoke10
-rw-r--r--dvb-t/uk-Limavady10
-rw-r--r--dvb-t/uk-Llanddona20
-rw-r--r--dvb-t/uk-Malvern11
-rw-r--r--dvb-t/uk-Mendip11
-rw-r--r--dvb-t/uk-Midhurst12
-rw-r--r--dvb-t/uk-Moel-y-Parc10
-rw-r--r--dvb-t/uk-Nottingham16
-rw-r--r--dvb-t/uk-OliversMount10
-rw-r--r--dvb-t/uk-Oxford11
-rw-r--r--dvb-t/uk-PendleForest10
-rw-r--r--dvb-t/uk-Plympton10
-rw-r--r--dvb-t/uk-PontopPike9
-rw-r--r--dvb-t/uk-Pontypool10
-rw-r--r--dvb-t/uk-Presely10
-rw-r--r--dvb-t/uk-Redruth9
-rw-r--r--dvb-t/uk-Reigate11
-rw-r--r--dvb-t/uk-RidgeHill11
-rw-r--r--dvb-t/uk-Rosemarkie10
-rw-r--r--dvb-t/uk-Rosneath10
-rw-r--r--dvb-t/uk-Rowridge11
-rw-r--r--dvb-t/uk-RumsterForest10
-rw-r--r--dvb-t/uk-Saddleworth10
-rw-r--r--dvb-t/uk-Salisbury10
-rw-r--r--dvb-t/uk-SandyHeath11
-rw-r--r--dvb-t/uk-Selkirk10
-rw-r--r--dvb-t/uk-Sheffield23
-rw-r--r--dvb-t/uk-StocklandHill10
-rw-r--r--dvb-t/uk-Storeton20
-rw-r--r--dvb-t/uk-Sudbury12
-rw-r--r--dvb-t/uk-SudburyB14
-rw-r--r--dvb-t/uk-SuttonColdfield20
-rw-r--r--dvb-t/uk-Tacolneston10
-rw-r--r--dvb-t/uk-TheWrekin19
-rw-r--r--dvb-t/uk-TheWrekinB11
-rw-r--r--dvb-t/uk-Torosay10
-rw-r--r--dvb-t/uk-TunbridgeWells10
-rw-r--r--dvb-t/uk-Waltham16
-rw-r--r--dvb-t/uk-Wenvoe11
-rw-r--r--dvb-t/uk-WhitehawkHill18
-rw-r--r--dvb-t/uk-WinterHill14
85 files changed, 755 insertions, 260 deletions
diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
new file mode 100644
index 00000000..e38aad5b
--- /dev/null
+++ b/dvb-t/uk-Aberdare
@@ -0,0 +1,10 @@
+# UK, Aberdare
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 562167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 489833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Angus b/dvb-t/uk-Angus
index 11dac611..250295df 100644
--- a/dvb-t/uk-Angus
+++ b/dvb-t/uk-Angus
@@ -1,9 +1,10 @@
-# UK Angus (Dundee) Transmitter
-# Note that this transmitter broadcasts incorrect network information (thinks it is Durris)
+# UK, Angus
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 753833000 8MHz 3/4 1/2 QAM16 2k 1/32 NONE
-T 777833000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 801833000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 825833000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 834167000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 850000000 8MHz 3/4 1/2 QAM16 2k 1/32 NONE
+T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 834167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 825833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BeaconHill b/dvb-t/uk-BeaconHill
new file mode 100644
index 00000000..8d1577d0
--- /dev/null
+++ b/dvb-t/uk-BeaconHill
@@ -0,0 +1,10 @@
+# UK, Beacon Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 721833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 794167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 770167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 738167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Belmont b/dvb-t/uk-Belmont
new file mode 100644
index 00000000..fee76dbf
--- /dev/null
+++ b/dvb-t/uk-Belmont
@@ -0,0 +1,10 @@
+# UK, Belmont
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Bilsdale b/dvb-t/uk-Bilsdale
index 654b438a..d05c95f6 100644
--- a/dvb-t/uk-Bilsdale
+++ b/dvb-t/uk-Bilsdale
@@ -1,3 +1,10 @@
-# UK Bilsdale Transmitter
+# UK, Bilsdale
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
+T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 498167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BlackHill b/dvb-t/uk-BlackHill
index 17eae724..ac8c2c1d 100644
--- a/dvb-t/uk-BlackHill
+++ b/dvb-t/uk-BlackHill
@@ -1,3 +1,10 @@
-# uk BlackHill
+# UK, Black Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 682167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Blaenplwyf b/dvb-t/uk-Blaenplwyf
index 8143cb56..35dbade2 100644
--- a/dvb-t/uk-Blaenplwyf
+++ b/dvb-t/uk-Blaenplwyf
@@ -1,4 +1,6 @@
-# uk Blaenplwyf
+# UK, Blaenplwyf
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/uk-BluebellHill b/dvb-t/uk-BluebellHill
index 64395016..096d08b2 100644
--- a/dvb-t/uk-BluebellHill
+++ b/dvb-t/uk-BluebellHill
@@ -1,16 +1,10 @@
-# Bluebell Hill (SE), Kent
-# http://www.dtg.org.uk/retailer/tx_lse.html
-# http://www.dtg.org.uk/retailer/dtt_channels.html
+# UK, Bluebell Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Multiplex 1 BBC
T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex 2 ITV/C4
T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Multiplex A SDN
T 522000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Multiplex B BBC
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex C Crown Castle
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex D Crown Castle
+T 665833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Bressay b/dvb-t/uk-Bressay
new file mode 100644
index 00000000..c77bfb07
--- /dev/null
+++ b/dvb-t/uk-Bressay
@@ -0,0 +1,10 @@
+# UK, Bressay
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BrierleyHill b/dvb-t/uk-BrierleyHill
new file mode 100644
index 00000000..20b32479
--- /dev/null
+++ b/dvb-t/uk-BrierleyHill
@@ -0,0 +1,10 @@
+# UK, Brierley Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 825833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 753833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 777833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BristolIlchesterCres b/dvb-t/uk-BristolIlchesterCres
new file mode 100644
index 00000000..c84c2240
--- /dev/null
+++ b/dvb-t/uk-BristolIlchesterCres
@@ -0,0 +1,10 @@
+# UK, Bristol Ilchester Cres.
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BristolKingsWeston b/dvb-t/uk-BristolKingsWeston
new file mode 100644
index 00000000..e3425ee7
--- /dev/null
+++ b/dvb-t/uk-BristolKingsWeston
@@ -0,0 +1,10 @@
+# UK, Bristol King's Weston
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 482000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 506000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 562000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Bromsgrove b/dvb-t/uk-Bromsgrove
new file mode 100644
index 00000000..efca5873
--- /dev/null
+++ b/dvb-t/uk-Bromsgrove
@@ -0,0 +1,10 @@
+# UK, Bromsgrove
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 537833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 569833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 489833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BrougherMountain b/dvb-t/uk-BrougherMountain
new file mode 100644
index 00000000..d8ad2386
--- /dev/null
+++ b/dvb-t/uk-BrougherMountain
@@ -0,0 +1,10 @@
+# UK, Brougher Mountain
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 490167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 514167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Caldbeck b/dvb-t/uk-Caldbeck
index 6a33bf97..75f29522 100644
--- a/dvb-t/uk-Caldbeck
+++ b/dvb-t/uk-Caldbeck
@@ -1,3 +1,10 @@
-# Caldbeck, Border Region
+# UK, Caldbeck
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
T 506000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 490000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 514167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Caradon b/dvb-t/uk-Caradon
deleted file mode 100644
index 95620020..00000000
--- a/dvb-t/uk-Caradon
+++ /dev/null
@@ -1,5 +0,0 @@
-# uk-Caradon
-# Multiplex 1 BBC1
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 1/2 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-CaradonHill b/dvb-t/uk-CaradonHill
index de0b668c..90f6eef4 100644
--- a/dvb-t/uk-CaradonHill
+++ b/dvb-t/uk-CaradonHill
@@ -1,5 +1,10 @@
-# Caradon Hill, Cornwall
+# UK, Caradon Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# Mux 1: BBC
T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 553833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 497833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Carmel b/dvb-t/uk-Carmel
new file mode 100644
index 00000000..32372c50
--- /dev/null
+++ b/dvb-t/uk-Carmel
@@ -0,0 +1,10 @@
+# UK, Carmel
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 825833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Chatton b/dvb-t/uk-Chatton
new file mode 100644
index 00000000..fe42d13c
--- /dev/null
+++ b/dvb-t/uk-Chatton
@@ -0,0 +1,10 @@
+# UK, Chatton
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 626167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 706167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Chesterfield b/dvb-t/uk-Chesterfield
new file mode 100644
index 00000000..ae6b88f8
--- /dev/null
+++ b/dvb-t/uk-Chesterfield
@@ -0,0 +1,10 @@
+# UK, Chesterfield
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 626000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 650000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 674000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Craigkelly b/dvb-t/uk-Craigkelly
index 325d7da0..63bb5d46 100644
--- a/dvb-t/uk-Craigkelly
+++ b/dvb-t/uk-Craigkelly
@@ -1,9 +1,10 @@
-# uk Craigkelly
-# gneeki@gmail.com
+# UK, Craigkelly
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE # MuxA 23
-T 514000000 8MHz 2/3 NONE QAM16 2k 1/32 NONE # MuxB 26
-T 538000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE # Mux2 29
-T 570000000 8MHz 2/3 NONE QAM16 2k 1/32 NONE # Mux1 33
-T 618000000 8MHz 2/3 NONE QAM16 2k 1/32 NONE # MuxD 39
-T 642000000 8MHz 2/3 NONE QAM16 2k 1/32 NONE # MuxC 42
+T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 538000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 489833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-CrystalPalace b/dvb-t/uk-CrystalPalace
index 07fcad9d..fc7e55e4 100644
--- a/dvb-t/uk-CrystalPalace
+++ b/dvb-t/uk-CrystalPalace
@@ -1,11 +1,10 @@
-# Crystal Palace - last update 06 Dec 2006
-# details can be found on:
-# http://www.ukfree.tv/txdetail.php?a=TQ339712
-# http://www.ofcom.org.uk/static/reception_advice/digital_trans_guide/show_transmitter.asp-siteID=66.html
+# UK, Crystal Palace
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE #Mux1, Ch25
-T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE #Mux2, Ch22
-T 561833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE #MuxA, Ch32
-T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE #MuxB, Ch28
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE #MuxC, Ch34
-T 537833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE #MuxD, Ch29
+T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 561833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 537833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Darvel b/dvb-t/uk-Darvel
new file mode 100644
index 00000000..4fa63828
--- /dev/null
+++ b/dvb-t/uk-Darvel
@@ -0,0 +1,10 @@
+# UK, Darvel
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 481833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 505833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 561833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Divis b/dvb-t/uk-Divis
index 96772def..38363752 100644
--- a/dvb-t/uk-Divis
+++ b/dvb-t/uk-Divis
@@ -1,8 +1,10 @@
-# Divis (Greater Belfast and the surrounding area)
+# UK, Divis
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
-T 514000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
T 538000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 569833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 489833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Dover b/dvb-t/uk-Dover
index 9e18499e..137b49f3 100644
--- a/dvb-t/uk-Dover
+++ b/dvb-t/uk-Dover
@@ -1,16 +1,14 @@
-# Dover (SE), Kent
-# http://www.dtg.org.uk/retailer/tx_lse.html
-# http://www.dtg.org.uk/retailer/dtt_channels.html
+# UK, Dover
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Multiplex 1 BBC
T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex 2 ITV/C4
-T 794000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Multiplex A SDN
-T 746000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Multiplex B BBC
-T 770000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex C Crown Castle
-T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex D Crown Castle
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 794167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 745833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+# UK, Dover B
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-DoverB b/dvb-t/uk-DoverB
deleted file mode 100644
index 7d3827c8..00000000
--- a/dvb-t/uk-DoverB
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dover B (SE), Kent
-# http://www.dtg.org.uk/retailer/tx_lse.html
-# http://www.dtg.org.uk/retailer/dtt_channels.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Multiplex 1 BBC
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex 2 ITV/C4
-T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/uk-Durris b/dvb-t/uk-Durris
index 28571950..851f0f3a 100644
--- a/dvb-t/uk-Durris
+++ b/dvb-t/uk-Durris
@@ -1,15 +1,10 @@
-# UK Durris (Aberdeen) Transmitter (used the Angus config file as a template)
-#
-# For more information about UK tuning feequencies see:
-# http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# and
-# http://www.digitalspy.co.uk/terrestrial/tuning/
-#
+# UK, Durris
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 546000000 8MHz 3/4 1/2 QAM16 2k 1/32 NONE
-T 578000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 634000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 658000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 713833000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 722167000 8MHz 3/4 1/2 QAM16 2k 1/32 NONE
+T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 722167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 634000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 658000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Eitshal b/dvb-t/uk-Eitshal
new file mode 100644
index 00000000..09926561
--- /dev/null
+++ b/dvb-t/uk-Eitshal
@@ -0,0 +1,10 @@
+# UK, Eitshal
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 546167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 561833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-EmleyMoor b/dvb-t/uk-EmleyMoor
index 4df49b2c..16df648b 100644
--- a/dvb-t/uk-EmleyMoor
+++ b/dvb-t/uk-EmleyMoor
@@ -1,8 +1,10 @@
-# Emley Moor, West Yorkshire
+# UK, Emley Moor
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 625833000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 649833000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 673833000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 697833000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 705833000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 722167000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
+T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 625833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 649833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 673833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 705833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Fenham b/dvb-t/uk-Fenham
new file mode 100644
index 00000000..f9f3da54
--- /dev/null
+++ b/dvb-t/uk-Fenham
@@ -0,0 +1,10 @@
+# UK, Fenham
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Fenton b/dvb-t/uk-Fenton
new file mode 100644
index 00000000..78c78197
--- /dev/null
+++ b/dvb-t/uk-Fenton
@@ -0,0 +1,10 @@
+# UK, Fenton
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 577833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 506167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Ferryside b/dvb-t/uk-Ferryside
new file mode 100644
index 00000000..20315640
--- /dev/null
+++ b/dvb-t/uk-Ferryside
@@ -0,0 +1,8 @@
+# UK, Ferryside
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Guildford b/dvb-t/uk-Guildford
index 5a694fe1..a5350a0a 100644
--- a/dvb-t/uk-Guildford
+++ b/dvb-t/uk-Guildford
@@ -1 +1,10 @@
-T 697833333 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+# UK, Guildford
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Hannington b/dvb-t/uk-Hannington
index 0bbbfdd1..30a261a0 100644
--- a/dvb-t/uk-Hannington
+++ b/dvb-t/uk-Hannington
@@ -1,3 +1,10 @@
-# Hannington, North Hampshire
+# UK, Hannington
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 626167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Hastings b/dvb-t/uk-Hastings
index 41b471ff..f5f7b712 100644
--- a/dvb-t/uk-Hastings
+++ b/dvb-t/uk-Hastings
@@ -1,19 +1,10 @@
-# Hastings, East Sussex, UK
-#
-# References:
-#    http://www.ukfree.tv/txdetail.php?a=TQ806100
-# http://www.ofcom.org.uk/static/reception_advice/digital_trans_guide/show_transmitter.asp-siteID=71.html
-#
+# UK, Hastings
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Mux 1
-T 553833000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-# Mux 2
-T 521833000 8MHz 2/3 2/3 QAM64 2k 1/32 NONE
-# Mux A
-T 474000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-# Mux B
-T 497833000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-# Mux C
-T 810000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-# Mux D
-T 786000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
+T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 497833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Heathfield b/dvb-t/uk-Heathfield
index 8d926e1f..b65db772 100644
--- a/dvb-t/uk-Heathfield
+++ b/dvb-t/uk-Heathfield
@@ -1,3 +1,10 @@
-# Heathfield, South-east England
+# UK, Heathfield
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 538000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 689833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 681833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-HemelHempstead b/dvb-t/uk-HemelHempstead
new file mode 100644
index 00000000..87fbe865
--- /dev/null
+++ b/dvb-t/uk-HemelHempstead
@@ -0,0 +1,10 @@
+# UK, Hemel Hempstead
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 690167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 786167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 777833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 802000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-HuntshawCross b/dvb-t/uk-HuntshawCross
new file mode 100644
index 00000000..9572b293
--- /dev/null
+++ b/dvb-t/uk-HuntshawCross
@@ -0,0 +1,13 @@
+# UK, Huntshaw Cross
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 737833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 769833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 793833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 817833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 761833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+# UK, Huntshaw Cross B
+T 714000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 682000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Idle b/dvb-t/uk-Idle
new file mode 100644
index 00000000..84fdc29f
--- /dev/null
+++ b/dvb-t/uk-Idle
@@ -0,0 +1,10 @@
+# UK, Idle
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 754000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-KeelylangHill b/dvb-t/uk-KeelylangHill
new file mode 100644
index 00000000..3b173759
--- /dev/null
+++ b/dvb-t/uk-KeelylangHill
@@ -0,0 +1,10 @@
+# UK, Keelylang Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 690167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 722167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Keighley b/dvb-t/uk-Keighley
new file mode 100644
index 00000000..7db30f49
--- /dev/null
+++ b/dvb-t/uk-Keighley
@@ -0,0 +1,10 @@
+# UK, Keighley
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 834000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-KilveyHill b/dvb-t/uk-KilveyHill
new file mode 100644
index 00000000..a091be63
--- /dev/null
+++ b/dvb-t/uk-KilveyHill
@@ -0,0 +1,10 @@
+# UK, Kilvey Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 529833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 561833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-KnockMore b/dvb-t/uk-KnockMore
new file mode 100644
index 00000000..f6ecb3c9
--- /dev/null
+++ b/dvb-t/uk-KnockMore
@@ -0,0 +1,10 @@
+# UK, Knock More
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 546167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Lancaster b/dvb-t/uk-Lancaster
new file mode 100644
index 00000000..69b6129e
--- /dev/null
+++ b/dvb-t/uk-Lancaster
@@ -0,0 +1,10 @@
+# UK, Lancaster
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-LarkStoke b/dvb-t/uk-LarkStoke
new file mode 100644
index 00000000..a7b7a398
--- /dev/null
+++ b/dvb-t/uk-LarkStoke
@@ -0,0 +1,10 @@
+# UK, Lark Stoke
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 498167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Limavady b/dvb-t/uk-Limavady
new file mode 100644
index 00000000..327d3184
--- /dev/null
+++ b/dvb-t/uk-Limavady
@@ -0,0 +1,10 @@
+# UK, Limavady
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 769833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 761833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 786167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 810167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Llanddona b/dvb-t/uk-Llanddona
index 82624bc2..123c6beb 100644
--- a/dvb-t/uk-Llanddona
+++ b/dvb-t/uk-Llanddona
@@ -1,12 +1,10 @@
-# Location: Llanddona
-# Power: 100kW
-# Grid Ref: SH583810
+# UK, Llanddona
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#chan 54
-T 738166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-#chan 58
-T 770000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-#chan 61
-T 794000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-#chan 64
-T 818000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 738167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 770167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 674000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Malvern b/dvb-t/uk-Malvern
index 1159569b..da02f7b2 100644
--- a/dvb-t/uk-Malvern
+++ b/dvb-t/uk-Malvern
@@ -1,3 +1,10 @@
-# Malvern (repeater for Sutton Coldfield)
+# UK, Malvern
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 3/4 1/2 QAM16 2k 1/32 NONE
+T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 682000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 658000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 714000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 634000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Mendip b/dvb-t/uk-Mendip
index 9f0d09d3..966d01fa 100644
--- a/dvb-t/uk-Mendip
+++ b/dvb-t/uk-Mendip
@@ -1,3 +1,10 @@
-# Mendip, Southern England
+# UK, Mendip
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754167000 8MHz 2/3 NONE QAM16 2k 1/32 NONE
+T 778167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 746167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 802167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 826167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Midhurst b/dvb-t/uk-Midhurst
index c52d3829..c1a5ceb8 100644
--- a/dvb-t/uk-Midhurst
+++ b/dvb-t/uk-Midhurst
@@ -1,8 +1,10 @@
-# uk Salisbury (uk Midhurst)
+# UK, Midhurst
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
T 826167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
T 802167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 778167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 818833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 778167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 817833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 786167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Moel-y-Parc b/dvb-t/uk-Moel-y-Parc
new file mode 100644
index 00000000..94e4997d
--- /dev/null
+++ b/dvb-t/uk-Moel-y-Parc
@@ -0,0 +1,10 @@
+# UK, Moel-y-Parc
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 770000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 794000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 818000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Nottingham b/dvb-t/uk-Nottingham
index a7e38d26..e94f1c4f 100644
--- a/dvb-t/uk-Nottingham
+++ b/dvb-t/uk-Nottingham
@@ -1,8 +1,10 @@
-# Nottingham (Kimberley, Nottinghamshire)
+# UK, Nottingham
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 618000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 730000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 778000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 810000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 842000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
+T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 842000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 538000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-OliversMount b/dvb-t/uk-OliversMount
new file mode 100644
index 00000000..1ad0017c
--- /dev/null
+++ b/dvb-t/uk-OliversMount
@@ -0,0 +1,10 @@
+# UK, Oliver's Mount
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 698000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 842167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 738167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Oxford b/dvb-t/uk-Oxford
index 035603e3..744a3d4b 100644
--- a/dvb-t/uk-Oxford
+++ b/dvb-t/uk-Oxford
@@ -1,3 +1,10 @@
-# Oxford
+# UK, Oxford
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 713833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 721833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 538000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-PendleForest b/dvb-t/uk-PendleForest
new file mode 100644
index 00000000..70d21cc4
--- /dev/null
+++ b/dvb-t/uk-PendleForest
@@ -0,0 +1,10 @@
+# UK, Pendle Forest
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Plympton b/dvb-t/uk-Plympton
new file mode 100644
index 00000000..c8c30a85
--- /dev/null
+++ b/dvb-t/uk-Plympton
@@ -0,0 +1,10 @@
+# UK, Plympton
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 842167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 833833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 809833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 754000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-PontopPike b/dvb-t/uk-PontopPike
index 95ca4f3c..af1f6a54 100644
--- a/dvb-t/uk-PontopPike
+++ b/dvb-t/uk-PontopPike
@@ -1,3 +1,10 @@
-# Pontop Pike, UK
+# UK, Pontop Pike
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 746167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 778167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 802167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 826167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Pontypool b/dvb-t/uk-Pontypool
new file mode 100644
index 00000000..c258ce8f
--- /dev/null
+++ b/dvb-t/uk-Pontypool
@@ -0,0 +1,10 @@
+# UK, Pontypool
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 482167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Presely b/dvb-t/uk-Presely
new file mode 100644
index 00000000..bdfe4f12
--- /dev/null
+++ b/dvb-t/uk-Presely
@@ -0,0 +1,10 @@
+# UK, Presely
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 714167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 665833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Redruth b/dvb-t/uk-Redruth
index 84dcb9a2..e8285a5b 100644
--- a/dvb-t/uk-Redruth
+++ b/dvb-t/uk-Redruth
@@ -1,3 +1,10 @@
-# Redruth, Cornwall
+# UK, Redruth
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 642167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 666167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 650167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 705833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Reigate b/dvb-t/uk-Reigate
index add0d8b2..dd40fbf7 100644
--- a/dvb-t/uk-Reigate
+++ b/dvb-t/uk-Reigate
@@ -1,3 +1,10 @@
-# Reigate
+# UK, Reigate
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 554000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-RidgeHill b/dvb-t/uk-RidgeHill
index 956e8fb3..40e13f4d 100644
--- a/dvb-t/uk-RidgeHill
+++ b/dvb-t/uk-RidgeHill
@@ -1,3 +1,10 @@
-# Ridge Hill
+# UK, Ridge Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
+T 730000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 762000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Rosemarkie b/dvb-t/uk-Rosemarkie
new file mode 100644
index 00000000..36df5819
--- /dev/null
+++ b/dvb-t/uk-Rosemarkie
@@ -0,0 +1,10 @@
+# UK, Rosemarkie
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 714167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 633833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 657833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 706167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Rosneath b/dvb-t/uk-Rosneath
new file mode 100644
index 00000000..facbd5c3
--- /dev/null
+++ b/dvb-t/uk-Rosneath
@@ -0,0 +1,10 @@
+# UK, Rosneath
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 729833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 761833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 809833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Rowridge b/dvb-t/uk-Rowridge
index c0c72a08..078d7a14 100644
--- a/dvb-t/uk-Rowridge
+++ b/dvb-t/uk-Rowridge
@@ -1,3 +1,10 @@
-# Rowridge, Isle of Wight
+# UK, Rowridge
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 489833333 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 489833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 530000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-RumsterForest b/dvb-t/uk-RumsterForest
new file mode 100644
index 00000000..87941b30
--- /dev/null
+++ b/dvb-t/uk-RumsterForest
@@ -0,0 +1,10 @@
+# UK, Rumster Forest
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 802000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Saddleworth b/dvb-t/uk-Saddleworth
new file mode 100644
index 00000000..dbd037c1
--- /dev/null
+++ b/dvb-t/uk-Saddleworth
@@ -0,0 +1,10 @@
+# UK, Saddleworth
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 682000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 633833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 657833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Salisbury b/dvb-t/uk-Salisbury
new file mode 100644
index 00000000..87b1c1d1
--- /dev/null
+++ b/dvb-t/uk-Salisbury
@@ -0,0 +1,10 @@
+# UK, Salisbury
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 745833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 753833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 721833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-SandyHeath b/dvb-t/uk-SandyHeath
index 05d0474b..8c6cf746 100644
--- a/dvb-t/uk-SandyHeath
+++ b/dvb-t/uk-SandyHeath
@@ -1,3 +1,10 @@
-# Sandy Heath
+# UK, Sandy Heath
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 641833334 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 665833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 626167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Selkirk b/dvb-t/uk-Selkirk
new file mode 100644
index 00000000..88f5f842
--- /dev/null
+++ b/dvb-t/uk-Selkirk
@@ -0,0 +1,10 @@
+# UK, Selkirk
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 730167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 762167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 786167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 810167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Sheffield b/dvb-t/uk-Sheffield
index 98349631..24696118 100644
--- a/dvb-t/uk-Sheffield
+++ b/dvb-t/uk-Sheffield
@@ -1,27 +1,10 @@
-#
-# Sheffield, South Yorkshire, UK
-#
-# References:
-# http://www.dtg.org.uk/retailer/tx_n.html
-# http://www.dtg.org.uk/retailer/dtt_channels.html
-# http://www.digitalspy.co.uk/terrestrial/tuning/
-#
+# UK, Sheffield
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# Multiplex 1 (Channel 39) BBC[1-3], BBC News 24
T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-#
-# Multiplex 2 (Channel 53) ITV[1-4], Channel 4, E4, More 4
T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-#
-# Multiplex A (Channel 57) Five, QVC, UK Gold, Discovery
T 762000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-#
-# Multiplex B (Channel 60) BBC4, CBeebies
T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-#
-# Multiplex C (Channel 45) Sky 3, UKTV History
T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-#
-# Multiplex D (Channel 42) The Hits, TMF, Film Four
T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-StocklandHill b/dvb-t/uk-StocklandHill
new file mode 100644
index 00000000..c0d3c3ee
--- /dev/null
+++ b/dvb-t/uk-StocklandHill
@@ -0,0 +1,10 @@
+# UK, Stockland Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 481833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 529833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 505833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 561833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Storeton b/dvb-t/uk-Storeton
index 2f331288..1ca08415 100644
--- a/dvb-t/uk-Storeton
+++ b/dvb-t/uk-Storeton
@@ -1,14 +1,10 @@
-# Storeton, Wirral
+# UK, Storeton
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Multiplex 1 BBC
T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex 2 Digital 3&4
-T 578166670 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-# Multiplex A SDN
-T 490166670 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-# Multiplex B BBC
-T 514166670 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-# Multiplex C Crown Castle
-T 538166670 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-# Multiplex D Crown Castle
-T 570166670 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
+T 578167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 490167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 514167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Sudbury b/dvb-t/uk-Sudbury
new file mode 100644
index 00000000..15e5e236
--- /dev/null
+++ b/dvb-t/uk-Sudbury
@@ -0,0 +1,12 @@
+# UK, Sudbury
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 698167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 690167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 706167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+# UK, Sudbury B
+T 754000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/uk-SudburyB b/dvb-t/uk-SudburyB
deleted file mode 100644
index 69f34dec..00000000
--- a/dvb-t/uk-SudburyB
+++ /dev/null
@@ -1,14 +0,0 @@
-# SudburyB, East Anglia
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# D1 - BBC Multiplex
-T 698166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# D2 - ITV Multiplex
-T 754000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# DA - Chan 5 Multiplex
-T 690166670 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# DB - Interactive Multiplex
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# DC - Sky Multiplex
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# DD - Radio / Audio Multiplex
-T 706166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-SuttonColdfield b/dvb-t/uk-SuttonColdfield
index 642b6ab0..67cf07fc 100644
--- a/dvb-t/uk-SuttonColdfield
+++ b/dvb-t/uk-SuttonColdfield
@@ -1,14 +1,10 @@
-# Suttoncoldfield, Midlands
+# UK, Sutton Coldfield
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ITV Multiplex
-T 658166670 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# BBC Multiplex
-T 634166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Chan 5 Multiplex
-T 682166670 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Interactive Multiplex
-T 714166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Sky Multiplex
-T 722166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Radio / Audio Multiplex
+T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 682167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Tacolneston b/dvb-t/uk-Tacolneston
new file mode 100644
index 00000000..b062cca4
--- /dev/null
+++ b/dvb-t/uk-Tacolneston
@@ -0,0 +1,10 @@
+# UK, Tacolneston
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 786000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 730167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 769833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 794000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 818000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-TheWrekin b/dvb-t/uk-TheWrekin
index 42d53103..435741c1 100644
--- a/dvb-t/uk-TheWrekin
+++ b/dvb-t/uk-TheWrekin
@@ -1,14 +1,15 @@
-# The Wrekin (W), Midlands
+# UK, The Wrekin
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Multiplex 1 BBC
T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex 2 Digital 3&4
T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Multiplex A SDN
-T 498166670 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Multiplex B BBC
-T 522166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex C Crown Castle
+T 498167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
T 730000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex D Crown Castle
T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+# UK, The Wrekin B
+T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 698000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-TheWrekinB b/dvb-t/uk-TheWrekinB
deleted file mode 100644
index a9343d08..00000000
--- a/dvb-t/uk-TheWrekinB
+++ /dev/null
@@ -1,11 +0,0 @@
-# The Wrekin B (E), Midlands
-# You may want to combine this with The Wrekin (W) transmitter for more channels
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Multiplex 1 BBC
-T 618166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# Multiplex 2 Digital 3&4
-T 698000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Multiplex A SDN
-T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-# Multiplex B BBC
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Torosay b/dvb-t/uk-Torosay
new file mode 100644
index 00000000..77af3c67
--- /dev/null
+++ b/dvb-t/uk-Torosay
@@ -0,0 +1,10 @@
+# UK, Torosay
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 490167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 514167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 538167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-TunbridgeWells b/dvb-t/uk-TunbridgeWells
new file mode 100644
index 00000000..6f57c1b3
--- /dev/null
+++ b/dvb-t/uk-TunbridgeWells
@@ -0,0 +1,10 @@
+# UK, Tunbridge Wells
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 794000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 642167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 666167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Waltham b/dvb-t/uk-Waltham
index fdb2b629..bc4ab0ec 100644
--- a/dvb-t/uk-Waltham
+++ b/dvb-t/uk-Waltham
@@ -1,8 +1,10 @@
-# Waltham (Melton Mowbray, Leicestershire)
+# UK, Waltham
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 514000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-T 570000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
-T 698000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
+T 698000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 490000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 514000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Wenvoe b/dvb-t/uk-Wenvoe
index a049b590..011c5243 100644
--- a/dvb-t/uk-Wenvoe
+++ b/dvb-t/uk-Wenvoe
@@ -1,3 +1,10 @@
-# Mendip, Southern England
+# UK, Wenvoe
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM16 2k 1/32 NONE
+T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 625833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 705833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 649833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 673833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-WhitehawkHill b/dvb-t/uk-WhitehawkHill
index 4fe0e459..0d343c3f 100644
--- a/dvb-t/uk-WhitehawkHill
+++ b/dvb-t/uk-WhitehawkHill
@@ -1,14 +1,10 @@
-# Whitehawk Hill, East Sussex (Brighton)
+# UK, Whitehawk Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# multiplex 1 BBC
T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# multiplex 2 Digital 3&4
-T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# multiplex A SDN
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# multiplex B BBC
+T 706000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 746000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# multiplex C Crown Castle
-T 770000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# multiplex D Crown Castle
-T 794000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-WinterHill b/dvb-t/uk-WinterHill
index b000623d..3ea6abd2 100644
--- a/dvb-t/uk-WinterHill
+++ b/dvb-t/uk-WinterHill
@@ -1,3 +1,13 @@
-# Winter Hill, North-West England
+# UK, Winter Hill
+# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
+# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 834167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 850167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+T 842167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 786167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 810167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+# UK, Winter Hill B
+T 650000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 626000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE