diff --git a/mod_php_install.sh b/mod_php_install.sh
index 7c62fca..2a89eff 100755
--- a/mod_php_install.sh
+++ b/mod_php_install.sh
@@ -240,10 +240,12 @@ _backup_date="$(date +%Y%m%d-%H%M)"
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
-   SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
+else
+   SYSTEMD_EXISTS=false
 fi
 
 # - Set variable
@@ -291,13 +293,13 @@ _required_base_packages="$_required_base_packages
    re2c
    sqlite3
    exif libexiv2-dev
-   netpbm libnetpbm10-dev
+   netpbm 
+   libnetpbm-dev
    libmcrypt-dev mcrypt
    libwebp-dev
    libpq-dev postgresql-client
    libreadline-dev libncurses-dev
-   libxslt1-dev libpcre3-dev
-   libc-client-dev
+   libxslt1-dev
    libicu-dev
    libtidy-dev
    libmm-dev libgmp-dev libkrb5-dev libldap-dev
@@ -313,6 +315,25 @@ _required_base_packages="$_required_base_packages
 
    # libcroco3-dev
 
+# libc-client-dev is no longer available on debian 13
+#
+if [[ "$os_dist" = "debian" ]] && [[ $os_version -lt 13 ]] ; then
+   _required_base_packages="$_required_base_packages
+      libc-client-dev"
+fi
+
+# Package libpcre3-dev is not availabl at debian 13, but libpcre2-dev is 
+# available there.
+#
+if [[ "$os_dist" = "debian" ]] && [[ $os_version -lt 13 ]] ; then
+   _required_base_packages="$_required_base_packages
+      libpcre3-dev"
+else
+   _required_base_packages="$_required_base_packages
+      libpcre2-dev"
+fi
+   
+
 # - Package libgraphicsmagick++3 is not available at ubunru 18.04"
 # -
 if [[ "$os_dist" != "ubuntu" ]] ; then
@@ -4033,8 +4054,12 @@ else
    --with-openssl"
 fi
 
-if ([[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]]) \
-   || [[ "$PHP_MAJOR_VERSION" -lt 8 ]] ; then
+#if ([[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]]) \
+#   || [[ "$PHP_MAJOR_VERSION" -lt 8 ]] ; then
+
+if [[ "$os_dist" = "debian" ]] && [[ "$os_version" -lt 13 ]] \
+   && ( [[ "$PHP_MAJOR_VERSION" -lt 8 ]] \
+        || ( [[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]] ) ) ; then
 
    config_params="$config_params
    --with-imap
@@ -6923,7 +6948,8 @@ echo "" >> ${_logdir}/pecl_install.log
 echononl "\tInstall 'imap' via pecl.."
 
 if ([[ "$PHP_MAJOR_VERSION" -eq 8 ]] && [[ "$PHP_MINOR_VERSION" -ge 4 ]]) \
-    || [[ "$PHP_MAJOR_VERSION" -gt 8 ]] ; then
+    || [[ "$PHP_MAJOR_VERSION" -gt 8 ]] \
+    || [[ "$os_dist" = "debian" ]] && [[ "$os_version" -ge 13 ]] ; then
    printf "\n" | ${PREFIX_PHP}/bin/pecl install imap >> "${_logdir}/pecl_install.log" 2>&1
    if [ "$?" = "0" ]; then
       echo_ok