diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbae197..fbfb9a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,21 @@
 # Freifunk München Firmware Changelog
 
+## v2018.0
+
+UNRELEASED
+
+ - Updated to Gluon v2016.2.7-2-g3d824bd2
+   - ar71xx: fix MAC addresses on TP-Link TL-WR1043ND v4
+   - modules: update url to chaos calmer git repository after upstream move
+
+ - Makefile
+   - Enabled firmware with ath10k WLAN driver
+
 ## v2017.1
 
- - Updated to Gluon v2017.7
+ - Updated to Gluon v2016.2.7
    - Changes:
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.1.7.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.7.html
 
 ## v2017.0
 
diff --git a/Makefile b/Makefile
index f2271a7..b2141f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2016.2.7
+GLUON_GIT_REF := 3d824bd21d7f6d5db6dc238d2a68b62de471aa2a
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
@@ -25,7 +25,8 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 
 GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
-			GLUON_BRANCH=${GLUON_BRANCH}
+			GLUON_BRANCH=${GLUON_BRANCH} \
+			GLUON_ATH10K_MESH=ibss
 
 all: info
 	${MAKE} manifest