diff --git a/ffnord-con-2015-2/room/config.json b/ffnord-con-2015-2/room/config.json
index a2f0f3a..e46bb28 100644
--- a/ffnord-con-2015-2/room/config.json
+++ b/ffnord-con-2015-2/room/config.json
@@ -8,6 +8,24 @@
             "irc": "irc://irc.hackint.org/#ffnord",
             "texture": "marble",
             "speed": 70
+        },
+        "NÄHSTUBE": {
+            "twitter": "#ffnord",
+            "irc": "irc://irc.hackint.org/#ffnord",
+            "texture": "marble",
+            "speed": 70
+        },
+        "sofa-ecke": {
+            "twitter": "#ffnord",
+            "irc": "irc://irc.hackint.org/#ffnord",
+            "texture": "marble",
+            "speed": 70
+        },
+        "extern": {
+            "twitter": "#ffnord",
+            "irc": "irc://irc.hackint.org/#ffnord",
+            "texture": "marble",
+            "speed": 70
         }
     }
 }
diff --git a/ffnord-con-2015-2/room/schedule.json b/ffnord-con-2015-2/room/schedule.json
index 5d27d78..0fc79a0 100644
--- a/ffnord-con-2015-2/room/schedule.json
+++ b/ffnord-con-2015-2/room/schedule.json
@@ -30,13 +30,13 @@
         "lang": "de",
         "place": "attraktor",
         "speakers": [
-            "t.b.a."
+            "kantorkel"
         ],
-        "start": "12:00",
-        "title": "Vortrags-Slot #1 mit folgender Diskussion und Kaffeepause",
+        "start": "12:15",
+        "title": "Freifunk für Flüchtlinge",
         "type": "talk",
-        "unix": 1442052000,
-        "unix_end": 1442055600
+        "unix": 1442052900,
+        "unix_end": 1442056500 
     },
 
     {
@@ -44,15 +44,29 @@
         "lang": "de",
         "place": "attraktor",
         "speakers": [
-            "t.b.a."
+            "andr3"
         ],
         "start": "14:00",
-        "title": "Vortrags-Slot #2 mit folgender Diskussion und Kaffeepause",
+        "title": "Planung von Richtfunk-Standorten",
         "type": "talk",
         "unix": 1442059200,
         "unix_end": 1442062800
     },
 
+    {
+        "duration": 120,
+        "lang": "de",
+        "place": "NÄHSTUBE",
+        "speakers": [
+            "DO9XE"
+        ],
+        "start": "14:00",
+        "title": "Workshop - ffnord-Netz aufsetzen",
+        "type": "talk",
+        "unix": 1442059200,
+        "unix_end": 1442066400
+    },
+
     {
         "duration": 240,
         "lang": "de",
@@ -66,6 +80,32 @@
         "unix_end": 1442080800
     },
 
+    {
+        "duration": 240,
+        "lang": "de",
+        "place": "NÄHSTUBE",
+        "speakers": [
+        ],
+        "start": "16:00",
+        "title": "Workshop und Hacking Time",
+        "type": "talk",
+        "unix": 1442066400,
+        "unix_end": 1442080800
+    },
+
+    {
+        "duration": 90,
+        "lang": "de",
+        "place": "extern",
+        "speakers": [
+        ],
+        "start": "18:00",
+        "title": "Besichtigung eines Richtfunk-Standorts",
+        "type": "talk",
+        "unix": 1442073600,
+        "unix_end": 1442079000
+    },
+
     {
         "duration": 60,
         "lang": "de",