diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64beabb9..cd559af3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,9 @@ In Development
 --------------
 
 * Starting with v0.28, TLS certificate provisioning wouldn't work on new boxes until the mailinabox setup command was run a second time because of a problem with the non-interactive setup.
+<<<<<<< HEAD
 
-* Update to Nextcloud 13.0.5.
+* Update to Nextcloud 13.0.6.
 * Update to Roundcube 1.3.7.
 * Update to Z-Push 2.4.4.
 
diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index 0105668c..e0e66c64 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -75,8 +75,8 @@ InstallNextcloud() {
 	fi
 }
 
-nextcloud_ver=13.0.5
-nextcloud_hash=e2b4a4bebd4fac14feae1e6e8997682f73fa8b50
+nextcloud_ver=13.0.6
+nextcloud_hash=33e41f476f0e2be5dc7cdb9d496673d9647aa3d6
 
 # Check if Nextcloud dir exist, and check if version matches nextcloud_ver (if either doesn't - install/upgrade)
 if [ ! -d /usr/local/lib/owncloud/ ] \