diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7b7f9e..fee1e12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,13 @@
 
 UNRELEASED
 
-- Updated to Gluon v2016.2 (upstream)
+- Updated to Gluon v2016.2.3 (upstream)
   - Changes:
-    https://gluon.readthedocs.org/en/v2016.2/releases/v2016.2.html
+    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html
+    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.html
+    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.1.html
+    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.2.html
+    - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html
 - site.mk
   - added GLUON_REGION = eu setting
 
diff --git a/Makefile b/Makefile
index 27396e3..01dfe21 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.2
+GLUON_GIT_REF := b0c647151c6b4889bca8f9226c1456179e86b25b
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
diff --git a/README.md b/README.md
index e965fe5..d45cc88 100644
--- a/README.md
+++ b/README.md
@@ -8,5 +8,5 @@ Check out this repository and execute `make`, i.e. like this:
 
 ## Further Resources
 
-Look at the [site configuration related Gluon documentation](http://gluon.readthedocs.org/en/v2016.1/user/site.html)
+Look at the [site configuration related Gluon documentation](https://gluon.readthedocs.io/en/v2016.2.3/user/site.html)
 for information on site configuration options and examples from other communities.