diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc
index 6ac0d1370..273f568a6 100755
--- a/bin/ncp-update-nc
+++ b/bin/ncp-update-nc
@@ -61,6 +61,12 @@ echo "Current   Nextcloud version $CURRENT"
 echo "Available Nextcloud version $VER"
 [[ "$NEED_UPDATE" == "true" ]] || { echo "Nothing to update"; exit 1; }
 
+# make sure that cron.php is not running and there are no pending jobs
+# https://github.com/nextcloud/server/issues/10949
+pgrep -cf cron.php &>/dev/null && { pkill -f cron.php; sleep 3; }
+pgrep -cf cron.php &>/dev/null && { echo "cron.php running. Abort"; exit 1; }
+mysql nextcloud <<<"UPDATE oc_jobs SET reserved_at=0;"
+
 # cleanup
 ####################
 cleanup() {
diff --git a/changelog.md b/changelog.md
index 2f0a73d64..19a825f5e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 
-[v0.64.1](https://github.com/nextcloud/nextcloudpi/commit/86c90e1) (2018-10-12) docker: make bin persistent too
+[v0.64.2](https://github.com/nextcloud/nextcloudpi/commit/10562dc) (2018-10-14) ncp-update-nc: make sure cron.php is not running and there are no pending jobs
+
+[v0.64.1](https://github.com/nextcloud/nextcloudpi/commit/c036525) (2018-10-12) docker: make bin persistent too
 
 [v0.64.0 ](https://github.com/nextcloud/nextcloudpi/commit/a9b1542) (2018-10-12) upgrade to NC14.0.3