diff --git a/install_mysql.sh b/install_mysql.sh
index f87b599..23bc8d9 100755
--- a/install_mysql.sh
+++ b/install_mysql.sh
@@ -7,7 +7,7 @@ _MYSQL_SRC_BASE_DIR=$(dirname $(realpath $0))
 _MYSQL_LOG_DIR=/var/log/mysql
 
 _MYSQL_PORT=3306
-_MYSQL_UNIX_SOCKET=/var/run/mysqld/mysqld.sock
+_MYSQL_UNIX_SOCKET=/run/mysqld/mysqld.sock
 
 
 _MYSQL_USER=mysql
@@ -2913,6 +2913,26 @@ if $UPDATE_MYSQL ; then
 	if [[ ! -f "$MY_CNF_FILE" ]] ; then
 		_new_cnf_needed=true
 	else
+
+      echononl "Ersetze 'socket' variable in 'my.cnf'.." 
+      if $(grep -q -E "^\s*socket\s*=\s*${MYSQL_UNIX_SOCKET}" "$MY_CNF_FILE" 2> /dev/null) ; then
+         echo_skipped
+      else
+         echo "" >> ${logdir}/main.log
+         echo "## - Ersetze 'socket' variable in 'my.cnf'.." >> ${logdir}/main.log
+         echo "## -" >> ${logdir}/main.log
+         echo "perl -i -n -p -e \"s#^(\s*socket\s*=).*#\1 ${MYSQL_UNIX_SOCKET}#\" \"$MY_CNF_FILE\"" >> ${logdir}/main.log
+
+         perl -i -n -p -e "s#^(\s*socket\s*=).*#\1 ${MYSQL_UNIX_SOCKET}#" "$MY_CNF_FILE" >> ${logdir}/main.log 2>&1
+         if [ "$?" = "0" ]; then
+            echo_ok
+         else
+            echo_failed
+            warn "Ersetzen von 'socket' variable in 'my.cnf' fehlgeschlagen."
+         fi
+
+      fi
+
 		if [[ "$MYSQL_MAJOR_VERSION" -gt 5 ]]  \
 			||  ( [[ "$MYSQL_MAJOR_VERSION" -eq 5 ]] && [[ "$MYSQL_MINOR_VERSION" -ge 7 ]] ) ; then
 			proof_var="thread[_-]concurrency"
@@ -6009,8 +6029,8 @@ else
    echo "" >> ${logdir}/main.log
    echo "## - Run 'mysql_upgrade -uroot' - this may take some (long) time" >> ${logdir}/main.log
    echo "## -" >> ${logdir}/main.log
-   echo "${MYSQL_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MYSQL_ROOT_PW" >> ${logdir}/main.log
-   ${MYSQL_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MYSQL_ROOT_PW >> ${logdir}/main.log 2>&1
+   echo "${MYSQL_INSTALL_DIR}/bin/mysql_upgrade -S $MYSQL_UNIX_SOCKET -uroot -p$MYSQL_ROOT_PW" >> ${logdir}/main.log
+   ${MYSQL_INSTALL_DIR}/bin/mysql_upgrade -S $MYSQL_UNIX_SOCKET  -uroot -p$MYSQL_ROOT_PW >> ${logdir}/main.log 2>&1
    ret_val=$?
    if [[ $ret_val -eq 0 ]] ; then
       echo_ok