diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 697c925d182e94a9b8ebc264ba8a7eff1b9e162f..20bdd08bc7ddb84125920c9e7220945f61879659 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -2523,6 +2523,10 @@ $app->log("update_jailkit_chroot called for $home_dir with options ".print_r($op
 				break;
 			default:
 				if (preg_match('@^skip[ =]/?(.+)$@', $opt, $matches) ) {
+					if (in_array($matches[1], $jailkit_directories)) {
+						$app->log("update_jailkit_chroot: skipping update of jailkit directory $home_dir/".$matches[1]
+							. "; if this is in use as a web folder, it is insecure and should be fixed.", LOGLEVEL_WARN);
+					}
 					$jailkit_directories = $app->functions->array_unset_by_value($jailkit_directories, $matches[1]);
 					$skips .= ' --skip=/'.escapeshellarg($matches[1]);
 				}
@@ -2740,6 +2744,10 @@ $app->log("delete_jailkit_chroot called for $home_dir with options ".print_r($op
 			switch ($opt) {
 			default:
 				if (preg_match('@^skip[ =]/?(.+)$@', $opt, $matches) ) {
+					if (in_array($matches[1], $jailkit_directories)) {
+						$app->log("delete_jailkit_chroot: skipping removal of jailkit directory .$home_dir/".$matches[1]
+							. "; if this is in use as a web folder, it is insecure and should be fixed.", LOGLEVEL_WARN);
+					}
 					$jailkit_directories = $app->functions->array_unset_by_value($jailkit_directories, $matches[1]);
 				}
 				break;