diff --git a/content/pages/space.xml b/content/pages/space.xml
index 6fd0518a6..057944326 100644
--- a/content/pages/space.xml
+++ b/content/pages/space.xml
@@ -3,6 +3,45 @@
 
 
 <page title="Hackspace">
+  <script xmlns="http://www.w3.org/1999/xhtml" type="application/ld+json">
+         {
+             "@context": "https://schema.org/",
+             "@type": "EventVenue",
+             "@id": "https://www.c3d2.de/space.html",
+             "name": "C3D2",
+             "longitude": 13.7286,
+             "latitude": 51.081,
+             "openingHoursSpecification": [
+                 {
+                     "@type": "OpeningHoursSpecification",
+                     "dayOfWeek": "https://schema.org/Tuesday",
+                     "opens": "18:00:00",
+                     "closes": "20:00:00"
+                 },
+                 {
+                     "@type": "OpeningHoursSpecification",
+                     "dayOfWeek": "https://schema.org/Thursday",
+                     "opens": "18:00:00",
+                     "closes":  "20:00:00"
+                 }
+             ],
+             "logo": "https://www.c3d2.de/images/ck.png",
+             "photo": "https://www.c3d2.de/images/hq_is_on.ink.png",
+             "image": "https://www.c3d2.de/images/hq/schalter.jpg",
+             "url": "https://www.c3d2.de/space.html",
+             "address": {
+                 "@id": "_:addr",
+                 "@type": "PostalAddress",
+                 "streetAddress": "Riesaer Str. 32",
+                 "postalCode": "01127",
+                 "addressLocality": "Dresden",
+                 "addressCountry": "DE"
+             },
+             "location": {
+                 "@id": "_:addr"
+             }
+         }
+  </script>
   <p title="Aktueller Hinweis:"><!--
 	<strong>Baustelle im Zentralwerk, Riesaer Straße 32 (Eingezogen seit Oktober 2016)</strong>
 	Wir sind Ende September 2016 aus dem GCHQ im Robotron-Bürogebäude
diff --git a/content/pages/whois.xml b/content/pages/whois.xml
index 14d9f8c0d..6441a428d 100644
--- a/content/pages/whois.xml
+++ b/content/pages/whois.xml
@@ -3,6 +3,21 @@
 
 
 <page title="Whois" pagetitle="Whois C3D2?">
+  <script xmlns="http://www.w3.org/1999/xhtml" type="application/ld+json">
+         {
+             "@context": "https://schema.org/",
+             "@type": "NGO",
+             "name": "Chaos Computer Club Dresden",
+             "logo": "https://www.c3d2.de/images/ck.png",
+             "email": "mail@c3d2.de",
+             "url": "https://www.c3d2.de/",
+             "ethicsPolicy": "https://www.ccc.de/en/hackerethik",
+             "location": {
+                 "@type": "Place",
+                 "@id": "https://www.c3d2.de/space.html"
+             }
+         }
+  </script>
  <p title="Wohin? Woher? Weshalb? C3D2?">
   Der CCC Dresden (C3D2) ist eine Gruppe von Leuten, die Spaß am kreativen Umgang mit Informationstechnologie haben.
  </p>