diff --git a/rc.d/2.tbdbcheck.sh.in b/rc.d/2.tbdbcheck.sh.in
index 49452391b21dfe5b9ba1e8986b2b9b44dd092606..7952c148894fc9ce6a5c77ff176ae8bf0e9428a5 100644
--- a/rc.d/2.tbdbcheck.sh.in
+++ b/rc.d/2.tbdbcheck.sh.in
@@ -14,9 +14,13 @@ DBNAME="@TBDBNAME@"
 LOGFILE="/var/log/mysqlcheck.log"
 
 command=/usr/local/bin/mysqlcheck
+socket=/tmp/mysql.sock
 
 case "$1" in
 	start|faststart|quietstart|onestart|forcestart)
+		if [ ! -e "$socket" ]; then
+		    sleep 10
+		fi
 		rm -f $LOGFILE
 		if [ $MAINSITE == "0" ]; then
 		    echo "*** Checking $DBNAME ..." >> $LOGFILE
@@ -30,6 +34,7 @@ case "$1" in
 		    echo "*** Checking geni-cm ..." >> $LOGFILE
 		    $command --auto-repair geni-cm >> $LOGFILE
 		fi
+		echo -n ' tbdbcheck'
 		;;
 	stop|faststop|quietstop|onestop|forcestop)
 		;;