diff --git a/docs/ip-assignments.md b/docs/ip-assignments.md
index 29ee4ff..c83e890 100644
--- a/docs/ip-assignments.md
+++ b/docs/ip-assignments.md
@@ -31,11 +31,11 @@ IP | Name | Notes
 .55 | ap-cf-mr-4 | ap conf floor main room
 .56 | ap-cf-sr-1 | ap conf floor second room
 .57 | ap-cf-sr-2 | ap conf floor second room
-.58 | ap-ws-ws-1 | ap workshop floor workshop area
-.59 | ap-ws-ws-2 | ap workshop floor workshop area
-.60 | ap-ws-ws-3 | ap workshop floor workshop area
-.61 | ap-ws-ws-4 | ap workshop floor workshop area
-.62 | ap-ws-noc-1 | ap worksop floor NOC/TEAM area
+.58 | ap-cf-ch   | ap conf floor chillout area
+.59 | ap-cf-qws  | ap conf floor quiet workshop area
+.60 | ap-ws-ws1  | ap workshop floor workshop area
+.61 | ap-ws-ws2  | ap workshop floor workshop area
+.62 | ap-ws-noc  | ap workshop floor NOC/team room
 
 ### Video
 IP | Name | Notes
diff --git a/docs/wifi.md b/docs/wifi.md
new file mode 100644
index 0000000..3dcfe11
--- /dev/null
+++ b/docs/wifi.md
@@ -0,0 +1,92 @@
+# OpenFest 2017 Wi-Fi
+
+## Usable channels
+
+### 2.4GHz band
+* Channel 1 (2412 MHz)
+* Channel 5 (2432 MHz)
+* Channel 9 (2452 MHz)
+* Channel 13 (2472 MHz)
+
+It is okay to have some minor overlap as long as general channel utilisation
+is low. Also, using 4 channels is unavoidable in the main room.
+
+### 5GHz band
+* Channel 42  (5170–5250 MHz, 5210MHz center frequency)
+* Channel 58  (5250–5330 MHz, 5290MHz center frequency)
+* Channel 106 (5490–5570 MHz, 5530MHz center frequency)
+* Channel 122 (5570–5650 MHz, 5610MHz center frequency)
+
+All channels are 80MHz wide since this is the minimum for 802.11ac.
+
+## Conference Floor 
+
+### Foaier
+* ap-cf-f-l
+    * device:
+    * 2.4 GHz: c13
+    * 5 GHz: c58
+
+* ap-cf-f-r
+    * device:
+    * 2.4 GHz: c13
+    * 5 GHz: c58
+
+### Main Room
+* ap-cf-mr-1
+    * device: 
+    * 2.4 GHz: c1
+    * 5 GHz: c42
+* ap-cf-mr-2
+    * device: 
+    * 2.4 GHz: c13
+    * 5 GHz: c58
+* ap-cf-mr-3
+    * device: 
+    * 2.4 GHz: c5
+    * 5 GHz: c106
+* ap-cf-mr-4
+    * device: 
+    * 2.4 GHz: c9
+    * 5 GHz: c122
+
+### Small Room
+* ap-cf-sr-1
+    * device: 
+    * 2.4 GHz: c9
+    * 5 GHz: c122
+* ap-cf-sr-2
+    * device: 
+    * 2.4 GHz: c1
+    * 5 GHz: c42 
+
+### Chill-out Area
+* ap-cf-ch
+    * device:
+    * 2.4 GHz: c1
+    * 5 GHz: c42
+
+### Quiet Workshop Area
+* ap-cf-qws
+    * device:
+    * 2.4 GHz: c13
+    * 5 GHz: c58
+
+## Workshop Floor
+
+### Workshop/Overflow Area
+* ap-ws-ws1
+    * device:
+    * 2.4 GHz: c9
+    * 5 GHz: c122
+* ap-ws-ws2
+    * device:
+    * 2.4 GHz: c13
+    * 5 GHz: c122
+
+### NOC/Team Room
+* ap-ws-noc
+    * device:
+    * 2.4 GHz: c5
+    * 5 GHz: c106
+