diff --git a/install_mysql.sh b/install_mysql.sh
index 3c4a63a..97628b7 100755
--- a/install_mysql.sh
+++ b/install_mysql.sh
@@ -592,6 +592,7 @@ do
       MYSQL_UNIX_SOCKET=$_MYSQL_UNIX_SOCKET
    fi
 done
+MYSQL_RUN_DIR="$(dirname "$MYSQL_UNIX_SOCKET")"
 
 
 # Unix socket file which X Plugin uses for connections. 
@@ -1984,55 +1985,54 @@ fi
 
 if $INSTALL_SYSTEMD_SERVICE ; then
 
-   #if [[ "$MYSQL_DISTRIBUTION" != "MariaDB" ]] ; then
-   if [[ -n "$SYSTEMD_PID_DIR" ]] ; then
+   if [[ -n "$MYSQL_RUN_DIR" ]] ; then
 
-      if [[ ! -d "$SYSTEMD_PID_DIR" ]] ; then
-         echononl "Create PID directory '$SYSTEMD_PID_DIR' .."
+      if [[ ! -d "$MYSQL_RUN_DIR" ]] ; then
+         echononl "Create Run directory '$MYSQL_RUN_DIR' .."
          echo "" >> ${logdir}/main.log
-         echo "## - Create PID directory '$SYSTEMD_PID_DIR'" >> ${logdir}/main.log
+         echo "## - Create Run directory '$MYSQL_RUN_DIR'" >> ${logdir}/main.log
          echo "## -" >> ${logdir}/main.log
-         echo "mkdir \"$SYSTEMD_PID_DIR\"" >> ${logdir}/main.log
+         echo "mkdir \"$MYSQL_RUN_DIR\"" >> ${logdir}/main.log
 
-         mkdir "$SYSTEMD_PID_DIR" >> ${logdir}/main.log 2>&1
+         mkdir "$MYSQL_RUN_DIR" >> ${logdir}/main.log 2>&1
          if [[ $? -eq 0 ]] ; then
             echo_ok
          else
             echo_failed
-            error "Creating PID directory '$SYSTEMD_PID_DIR' failed!"
+            error "Creating Run directory '$MYSQL_RUN_DIR' failed!"
          fi
 
-         echononl "Change owner of PID directory '$SYSTEMD_PID_DIR'"
+         echononl "Change owner of run directory '$MYSQL_RUN_DIR'"
          echo "" >> ${logdir}/main.log
-         echo "## - Change owner of PID directory '$SYSTEMD_PID_DIR'" >> ${logdir}/main.log
+         echo "## - Change owner of run directory '$MYSQL_RUN_DIR'" >> ${logdir}/main.log
          echo "## -" >> ${logdir}/main.log
-         echo "chown $MYSQL_USER:${MYSQL_GROUP} \"${SYSTEMD_PID_DIR}\"" >> ${logdir}/main.log
+         echo "chown $MYSQL_USER:${MYSQL_GROUP} \"${MYSQL_RUN_DIR}\"" >> ${logdir}/main.log
 
-         chown $MYSQL_USER:${MYSQL_GROUP} ${SYSTEMD_PID_DIR} >> ${logdir}/main.log
+         chown $MYSQL_USER:${MYSQL_GROUP} ${MYSQL_RUN_DIR} >> ${logdir}/main.log
          if [[ $? -eq 0 ]] ; then
             echo_ok
          else
             echo_failed
-            error "Changing owner of  PID directory '$SYSTEMD_PID_DIR' failed!"
+            error "Changing owner of un directory '$MYSQL_RUN_DIR' failed!"
          fi
 
-         echononl "Force systemd to create PID file directory on each startup.."
+         echononl "Force systemd to create run directory on each startup.."
          echo "" >> ${logdir}/main.log
-         echo "## - Force systemd to create PID file directory on each startup."
+         echo "## - Force systemd to create run directory on each startup."
          echo "## -" >> ${logdir}/main.log
          echo "## -    Create '/etc/tmpfiles.d/mysql.conf' with content:" >> ${logdir}/main.log
          echo "## -" >> ${logdir}/main.log
          echo "## -        # systemd tmpfile settings for mysql or mariadb" >> ${logdir}/main.log
-         echo "## -        d $SYSTEMD_PID_DIR 0755 $MYSQL_USER $MYSQL_GROUP -" >> ${logdir}/main.log
+         echo "## -        d $MYSQL_RUN_DIR 0755 $MYSQL_USER $MYSQL_GROUP -" >> ${logdir}/main.log
          echo "## -" >> ${logdir}/main.log
          echo "" >> ${logdir}/main.log
          echo "cat << EOF > /etc/tmpfiles.d/mysqld.conf
 # systemd tmpfile settings for mysql or mariadb
-d $SYSTEMD_PID_DIR 0755 $MYSQL_USER $MYSQL_GROUP -
+d $MYSQL_RUN_DIR 0755 $MYSQL_USER $MYSQL_GROUP -
 EOF" >> ${logdir}/main.log
          cat <<EOF > /etc/tmpfiles.d/mysqld.conf 
 # systemd tmpfile settings for mysql or mariadb
-d $SYSTEMD_PID_DIR 0755 $MYSQL_USER $MYSQL_GROUP -
+d $MYSQL_RUN_DIR 0755 $MYSQL_USER $MYSQL_GROUP -
 EOF
          if [[ $? -eq 0 ]] ; then
             echo_ok
@@ -5646,19 +5646,19 @@ else
 fi
 
 echo ""
-echononl "Erstelle Pid Verzeichnis '$SYSTEMD_PID_DIR'.."
-if [[ ! -d "${SYSTEMD_PID_DIR}" ]] ; then
+echononl "Erstelle MySQL Run-Verzeichnis '$MYSQL_RUN_DIR'.."
+if [[ ! -d "${MYSQL_RUN_DIR}" ]] ; then
 
    echo "" >> ${logdir}/main.log
-   echo "## - Erstelle Pid Verzeichnis '$SYSTEMD_PID_DIR'.." >> ${logdir}/main.log
+   echo "## - Erstelle MySQL Run-Verzeichnis '$MYSQL_RUN_DIR'.." >> ${logdir}/main.log
    echo "## -" >> ${logdir}/main.log
-   echo "mkdir -p $SYSTEMD_PID_DIR" >> ${logdir}/main.log
-   mkdir $SYSTEMD_PID_DIR >> ${logdir}/main.log  2>&1
+   echo "mkdir $MYSQL_RUN_DIR" >> ${logdir}/main.log
+   mkdir $MYSQL_RUN_DIR >> ${logdir}/main.log  2>&1
    if [ "$?" = "0" ]; then
       echo_ok
    else
       echo_failed
-      error "Kann Pid Verzeichnis  \"${SYSTEMD_PID_DIR}\" nicht erstellen.."
+      error "Kann MySQL Run-Verzeichnis  \"${MYSQL_RUN_DIR}\" nicht erstellen.."
 
       echononl "continue anyway [yes/no]: "
       read OK
@@ -5671,17 +5671,17 @@ if [[ ! -d "${SYSTEMD_PID_DIR}" ]] ; then
 
    fi
 
-   echononl "Setze Besitzer \"${MYSQL_USER}:${MYSQL_GROUP}\" für Pid-Verzeichnis"
+   echononl "Setze Besitzer \"${MYSQL_USER}:${MYSQL_GROUP}\" für Run-Verzeichnis"
    echo "" >> ${logdir}/main.log
-   echo "## - Setze Besitzer \"${MYSQL_USER}:${MYSQL_GROUP}\" für Pid-Verzeichnis" >> ${logdir}/main.log
+   echo "## - Setze Besitzer \"${MYSQL_USER}:${MYSQL_GROUP}\" für Run-Verzeichnis" >> ${logdir}/main.log
    echo "## -" >> ${logdir}/main.log
-   echo "chown ${MYSQL_USER}:${MYSQL_GROUP} ${SYSTEMD_PID_DIR}" >> ${logdir}/main.log
-   chown ${MYSQL_USER}:${MYSQL_GROUP} ${SYSTEMD_PID_DIR} >> ${logdir}/main.log  2>&1
+   echo "chown ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_RUN_DIR}" >> ${logdir}/main.log
+   chown ${MYSQL_USER}:${MYSQL_GROUP} ${MYSQL_RUN_DIR} >> ${logdir}/main.log  2>&1
    if [[ $? -eq 0 ]] ; then
       echo_ok
    else
       echo_failed
-      error "Kann Besitzer für das Pid-Verzeichnis  \"${SYSTEMD_PID_DIR}\" nicht ändern.."
+      error "Kann Besitzer für das MySQL Run-Verzeichnis  \"${MYSQL_RUN_DIR}\" nicht ändern.."
 
       echononl "continue anyway [yes/no]: "
       read OK