diff --git a/mod_php_install.sh b/mod_php_install.sh
index d134a88..6217122 100755
--- a/mod_php_install.sh
+++ b/mod_php_install.sh
@@ -3967,7 +3967,8 @@ echo "cd /tmp" >> ${_logdir}/pecl_install.log
 echo "_MagickWand_config=\$(which MagickWand-config)" >> ${_logdir}/pecl_install.log
 cd /tmp
 _MagickWand_config=`which MagickWand-config`
-if [ -z "$_MagickWand_config" ]; then
+
+if [[ -z "$_MagickWand_config" ]] || [[ ! -f "$(realpath "$_MagickWand_config")" ]]; then
 
    echo "# Remove broken link '/usr/bin/MagickWand-config'" >> ${_logdir}/pecl_install.log
    echo "rm /usr/bin/MagickWand-config" >> ${_logdir}/pecl_install.log
@@ -3988,14 +3989,23 @@ if [ -z "$_MagickWand_config" ]; then
    echo "" >> ${_logdir}/pecl_install.log
    echo "# Update file name database (updatedb).." >> ${_logdir}/pecl_install.log
    echo "updatedb" >> ${_logdir}/pecl_install.log
-   updatedb >> ${_logdir}/pecl_install.log 2>&1
-   if [ "$?" = "0" ]; then
-      echo_ok
+   if $SKIP_UPDATE_DB ; then
+      echo_skipped
    else
-      echo_failed
+      updatedb >> ${_logdir}/pecl_install.log 2>&1
+      if [ "$?" = "0" ]; then
+         echo_ok
+      else
+         echo_failed
+      fi
    fi
 
    _MagickWand_config=`locate MagickWand-config | grep -e "/MagickWand-config$" | head -n 1`
+
+   if [ ! -f "$_MagickWand_config" ]; then
+      _MagickWand_config="$(find /usr/lib/x86_64-linux-gnu/ -type f -name MagickWand-config | head -n 1)"
+   fi
+
    if [ -f "$_MagickWand_config" ]; then
       echononl "\tSymlink /usr/bin/MagickWand-config --> $_MagickWand_config"
       echo "" >> ${_logdir}/pecl_install.log
@@ -4011,7 +4021,7 @@ if [ -z "$_MagickWand_config" ]; then
       warn "Cannot find \"MagickWand_config\" - but is needed for \"imagick\"."
       echo "" >> ${_logdir}/pecl_install.log
       echo "# ---" >> ${_logdir}/pecl_install.log
-      echo "# Warning: Cannot find \"MagickWand_config\" - but is needed for \"imagick\"."
+      echo "# Warning: Cannot find \"MagickWand_config\" - but is needed for \"imagick\"." >> ${_logdir}/pecl_install.log
       echo "# ---" >> ${_logdir}/pecl_install.log
       
    fi