Index: channels/surfmusik.py
==================================================================
--- channels/surfmusik.py
+++ channels/surfmusik.py
@@ -89,31 +89,31 @@
         if path is not None:
             html = http.get(self.base + path + cat.lower() + ".html")
             html = re.sub("&#x?\d+;", "", html)
         
             rx_radio = re.compile(r"""
+                <td\s+class="home1"><a[^>]*\s+href="(.+?)"[^>]*> .*?
                 <a\s+class="navil"\s+href="([^"]+)"[^>]*>([^<>]+)</a></td>
                 <td\s+class="ort">(.*?)</td>.*?
                 <td\s+class="ort">(.*?)</td>.*?
-                <td\s+class="home1"><a\s+class="navil"\s+href="(.+?)"
             """, re.X|re.I)
             rx_video = re.compile(r"""
                 <a[^>]+href="([^"]+)"[^>]*>(?:<[^>]+>)*Externer
             """, re.X|re.I)
 
             # per-country list
             for uu in rx_radio.findall(html):
-                (homepage, name, genre, stadt, url) = uu
+                (url, homepage, name, genre, stadt) = uu
                 
                 # find mms:// for webtv stations
                 if is_tv:
                     m = rx_video.search(http.get(url))
                     if m:
                         url = m.group(1)
                 # just convert /radio/ into /m3u/ link
                 else:
-                    url = "http://www.surfmusik.de/m3u/" + url[30:-5] + ".m3u",
+                    url = "http://www.surfmusik.de/m3u/" + url[30:-5] + ".m3u"
 
                 entries.append({
                     "title": name,
                     "homepage": homepage,
                     "url": url,