diff --git a/content/pages/space.xml b/content/pages/space.xml
index fdb91930c..e8a7c41f4 100644
--- a/content/pages/space.xml
+++ b/content/pages/space.xml
@@ -43,10 +43,9 @@
     <li>Stereoanlage über Pulseaudio, 52″-Fernseher, externe Bildschirme, bunte Lichter</li>
     <li>Werkzeug, Lötkolben, Gaffer Tape, Elektronikschrott</li>
   </ul>
-  <p title="Anschrift" itemprop="description" itemscope="itemscope" itemtype="http://schema.org/Place" class="vcard">
+  <div title="Anschrift" itemprop="description" itemscope="itemscope" itemtype="http://schema.org/Place" class="vcard">
 	<!-- <div itemprop="alternateName">&lt;&lt;&lt;/&gt;&gt; c3d2 &lt;&lt;&lt;/&gt;&gt;</div> -->
-	<div class="fn">Chaos Computer Club Dresden</div>
-    <div itemprop="name" class="org">Netzbiotop e.V.</div>
+    <span itemprop="name" class="org">Netzbiotop e.V.</span> / <span class="fn">Chaos Computer Club Dresden</span>
     <div itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress" class="adr address">
       Briefkasten <span class="post-office-box">75</span>,
       <span class="extended-address">robotron-Bürokomplex</span>,
@@ -54,15 +53,7 @@
       <span itemprop="postalCode" class="postal-code">01069</span>
       <span itemprop="addressLocality" class="locality">Dresden</span>
     </div>
-    <span class="geo">
-      <span class="latitude">
-        <span class="value-title" title="51.04711"></span>
-      </span>
-      <span class="longitude">
-        <span class="value-title" title="13.74683"></span>
-      </span>
-    </span>
-  </p>
+  </div>
   <p>
     Schau auch im Wiki:
   </p>