diff --git a/sources.conf b/sources.conf
index 86a6a9f7..bfc9b635 100644
--- a/sources.conf
+++ b/sources.conf
@@ -4,6 +4,14 @@
 #
 # code  description
 #
+# S (satellite) xy.z (orbital position in degrees) E or W (east or west)
+# Note: only the first part is actually used by VDR. The description part
+# is for the "human" interface for clarity.
+#
+# '&' means same orbital position but different host company.
+# '/' means same (or very little deviation) orbital position & host.
+# A value in () means this satellite is still in it's test phase.
+#
 # Please contact kls@cadsoft.de before assigning a new code
 # to a description, in order to keep them unique.
 
@@ -12,60 +20,65 @@
 S5E     Sirius 2/3
 S7E     Eutelsat W3
 S10E    Eutelsat W1R
-S13E    Hotbird 1-5
+S13E    Hotbird 1-(5)-6
 S16E    Eutelsat W2
-S19.2E  Astra 1
+S19.2E  Astra 1B/C/E/F/G/H/2C
 S21.5E  Eutelsat II F3
 S23.5E  Astra 3A
+S24.2E  Astra 1D
 S26E    Arabsat 2A/3A
-S28.2E  Astra 2
+S28.2E  Astra 2D/A/B 
 S28.5E  Eurobird
 S30.5E  Arabsat 2B
 S31.3E  Türksat 1B
-S36E    Eutelsat W4 / Sesat
-S40E    Goriz & Hellas Sat
-S42E    Turksat 1C / Eurasiasat
-S45.5E  Europe Star 1
-S47.5E  Europe Star B 
-S48E    Eutelsat II F1 48E
+S36E    Eutelsat W4 & Sesat
+S39E    Hellas Sat
+S40E    Express A1R
+S42E    Turksat 1C & EurAsiaSat 1 & NewSat 1
+S45E    Europe*Star 1
+S48E    Eutelsat II F1 
 S50E    Anatolia 1
-S53E    Goriz 32 53E
+S53E    Gorizont 32
+S55.1E  Insat 2DT
+S56E    Most 1
 S57E    NSS 703
 S60E    Intelsat 904
-S62E    Intelsat 602
-S64E    Intelsat 804 
+S62E    Intelsat 902
+S64E    Intelsat 906 
 S66E    Intelsat 704
-S68.5E  PAS 4/7
-S72E    PAS 4 72E
+S68.5E  PAS 7/10
+S72E    PAS 4 
+S74E    Insat 3C
 S75E    LMI 1
-S76.5E  Apstar 76.5E
-S78.5E  Thaicom 78.5E
-S80E    Express 80E
-S83E    Intelsat
+S76.5E  Apstar
+S78.5E  Thaicom 2/3
+S80E    Express 6A
+S83E    Insat 2E/3B
 
-S1W     Thor 2/3 / Intelsat 707
+S1W     Thor 2/3 & Intelsat 707
 S4W     Amos 1
-S5W     Telecom 2C Atlantic Bird 3
-S7W     Nilesat 101/102
-S8W     Telecom 2A & 2D / Atlantic bird 2
+S5W     Telecom 2C & Atlantic Bird 3
+S7W     Nilesat 101 & 102
+S8W     Telecom 2A/2D & Atlantic Bird 2
 S11W    Express 3A
 S12.5W  Eutelsat II F2
-S14W    Express 2
+S14W    Gorizont 26
 S15W    Telstar 12
 S18W    Intelsat 901
-S21W    NSS 803
-S27.5W  Intelsat 27.5W
+S21.5W  NSS 7
+S27.5W  Intelsat 605
 S30W    Hispasat 1
-S31.5W  Intelsat 31.5W
-S34.5W  Intelsat 34.5W
+S31.5W  Intelsat 801
+S34.5W  Intelsat 903
 S37.5W  Telstar 11
 S40.5W  NSS 806
-S43W    PAS 3R
-S45W    PAS 1
-S47W    TDRS 6 47W
-S53W    Intelsat 706 53W
+S43W    PAS 3R/6/6B
+S45W    PAS 1/5R
+S47W    TDRS 6
+S53W    Intelsat 706
 S55.5W  Intelsat 805
-S58W    PAS 5/9 58W
+S58W    PAS 9
+S61.5W  Echostar 3
 
 # Cable