diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa38ff6..e49899e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,13 @@
 # Freifunk München Firmware Changelog
 
 ## v2016.1 (not released yet)
- - Updated to Gluon v2016.1.3 (ffmuc fork)
+ - Updated to Gluon v2016.1.4 (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
      - mesh_no_rebroadcast for mesh-on-wan (8b66da95f1887fc6068a6e9d6b6494c2ff4d2fb4)
      - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7)
  - site.conf
diff --git a/Makefile b/Makefile
index b438417..827d70b 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 := 8551a1d8cb43ced225d7111422cf5808eee38f2d
+GLUON_GIT_REF := de20e8a01a0e87d3225f5e5126f76353ed0286f8
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key