diff --git a/install_mysql.sh b/install_mysql.sh
index ae5982d..086be4d 100755
--- a/install_mysql.sh
+++ b/install_mysql.sh
@@ -2247,7 +2247,10 @@ if ! $UPDATE_MYSQL ; then
    cd $MYSQL_INSTALL_DIR
    echo "" >> ${logdir}/main.log
 
-   if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]] ; then
+   if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]] \
+      || ( [[ "$MYSQL_DISTRIBUTION" = "MySQL" ]] \
+           && [[ $MYSQL_MAJOR_VERSION -eq 5 ]] \
+           && [[ $MYSQL_MINOR_VERSION -le 6 ]] ); then
 
 		echo "## - Richte $MYSQL_DISTRIBUTION Systemtabellen ein" >> ${logdir}/main.log
 		echo "## -" >> ${logdir}/main.log
@@ -4932,7 +4935,10 @@ if ! $UPDATE_MYSQL ; then
 
    ## - Set root password
    ## -
-   if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]]; then
+   if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]] \
+      || ( [[ "$MYSQL_DISTRIBUTION" = "MySQL" ]] \
+           && [[ $MYSQL_MAJOR_VERSION -eq 5 ]] \
+           && [[ $MYSQL_MINOR_VERSION -le 6 ]] ); then
 
       echononl "Setze root Passwort für den MySQL Zugang"