diff --git a/install_update_dovecot.sh b/install_update_dovecot.sh
index 5ddd8af..b770a30 100755
--- a/install_update_dovecot.sh
+++ b/install_update_dovecot.sh
@@ -2308,6 +2308,22 @@ EOF
       else
          echo -e "$rc_skipped"
       fi
+
+      echononl "Adjust 'PIDFile' at file 'dovecot.service'.."
+      if [[ -f "/etc/systemd/system/dovecot.service" ]] ; then
+         if $(grep -q -o -E "^\s*PIDFile\s*=\s*/var/run/" /etc/systemd/system/dovecot.service 2> /dev/null ) ; then
+            perl -i -n -p -e "s/^(PIDFile\s*=\/var(\/run\/.+))/#\1\nPIDFile=\2/" /etc/systemd/system/dovecot.service
+            if [[ $? -eq 0 ]]; then
+               echo -e "$rc_done"
+            else
+                echo -e "$rc_failed"
+            fi
+         else
+            echo -e "$rc_skipped"
+         fi
+      else
+         echo -e "$rc_skipped"
+      fi
    fi
 
    ## - Add a cronjob to restart dovecot after booting the system.