diff --git a/CHANGELOG.md b/CHANGELOG.md
index f98c322..e53452f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,14 @@
 # Freifunk München Firmware Changelog
 
 ## v2016.1 (not released yet)
- - Updated to Gluon v2016.1.4 (ffmuc fork)
+ - Updated to Gluon v2016.1.5 (ffmuc fork)
    - Changes:
      - https://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html
      - https://gluon.readthedocs.org/en/v2016.1.1/releases/v2016.1.1.html
      - https://gluon.readthedocs.org/en/v2016.1.2/releases/v2016.1.2.html
      - https://gluon.readthedocs.org/en/v2016.1.3/releases/v2016.1.3.html
      - https://gluon.readthedocs.org/en/v2016.1.4/releases/v2016.1.4.html
-     - ar71xx-generic: remove BROKEN for TL-WR841N/ND v11  (ce563f25adf08d6284ea92c81b6d30c0601df3b8)
+     - https://gluon.readthedocs.org/en/v2016.1.5/releases/v2016.1.5.html
      - mesh_no_rebroadcast for mesh-on-wan (8b66da95f1887fc6068a6e9d6b6494c2ff4d2fb4)
      - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7)
  - site.conf
diff --git a/Makefile b/Makefile
index f89882d..6c6cb8d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git
-GLUON_GIT_REF := 668d4c1c91d2671399ee6bdd78e1c5b98e0f2fba
+GLUON_GIT_REF := 855ae5ee475eda10cef06ccf9780252c3c14baed 
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key