diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41541f7d..44cd1b3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ In Development
 Mail:
 
 * The default theme for Roundcube was changed to the nicer Larry theme.
-* Exchange/ActiveSync support has been replaced with z-push 2.3.5 from z-push.org (rather than z-push-contrib).
+* Exchange/ActiveSync support has been replaced with z-push 2.3.6 from z-push.org (rather than z-push-contrib).
 
 ownCloud (now Nextcloud):
 
diff --git a/setup/zpush.sh b/setup/zpush.sh
index cbe2f7bd..0a9e3998 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -22,8 +22,8 @@ apt_install \
 php5enmod imap
 
 # Copy Z-Push into place.
-TARGETHASH=3ce78c23e02198bffe80c983ce247350c27590bd
-VERSION=2.3.5
+TARGETHASH=131229a8feda09782dfd06449adce3d5a219183f
+VERSION=2.3.6
 needs_update=0 #NODOC
 if [ ! -f /usr/local/lib/z-push/version ]; then
 	needs_update=1 #NODOC