diff --git a/freifunkmeta.php b/freifunkmeta.php
index 7faa142..72ea73f 100644
--- a/freifunkmeta.php
+++ b/freifunkmeta.php
@@ -294,15 +294,16 @@ EOT;
 			return '';
 		}
 		$services = $citydata['services'];
-		$outstr   = '<ul>';
-		foreach ( $services as $service ) {
-			$outstr .= sprintf(
-				'<li>%s (%s): <a href="%s">%s</a></li>',
-				$service['serviceName'], $service['serviceDescription'],
-				$service['internalUri'], $service['internalUri']
-			);
-		}
-		$outstr .= '</ul>';
+		$outstr   = '<table><th>Dienst</th><th>Beschreibung</th><th>Freifunk URI</th><th>Internet URI</th>';
+                foreach ( $services as $service ) {
+                        $outstr .= sprintf(
+                                '<tr><td>%s</td><td>%s</td><td><a href="%s">%s</a></td><td><a href="%s">%s</a></td></tr>',
+                                $service['serviceName'], $service['serviceDescription'],                       
+                                $service['internalUri'], $service['internalUri'],
+                                $service['externalUri'], $service['externalUri']
+                        );
+                }
+                $outstr .= '</table>';
 		return $outstr;
 	}