diff --git a/config b/config
index 3f53cd0..a8985c6 100644
--- a/config
+++ b/config
@@ -6,6 +6,7 @@ export MYSQL_ROOT=${MYSQL_ROOT:="/var/lib/dokku/services/mysql"}
 export PLUGIN_COMMAND_PREFIX="mysql"
 export PLUGIN_DATA_ROOT=$MYSQL_ROOT
 export PLUGIN_DATASTORE_PORTS=(3306)
+export PLUGIN_DATASTORE_WAIT_PORT=3306
 export PLUGIN_DEFAULT_ALIAS="DATABASE"
 export PLUGIN_ALT_ALIAS="DOKKU_MYSQL"
 export PLUGIN_IMAGE=$MYSQL_IMAGE
diff --git a/functions b/functions
index 8795b2b..a101286 100755
--- a/functions
+++ b/functions
@@ -392,7 +392,7 @@ service_create_container() {
   echo "$ID" > "$SERVICE_ROOT/ID"
 
   dokku_log_verbose_quiet "Waiting for container to be ready"
-  docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait > /dev/null
+  docker run --rm --link "$SERVICE_NAME:$PLUGIN_COMMAND_PREFIX" dokkupaas/wait -p "$PLUGIN_DATASTORE_WAIT_PORT" > /dev/null
 
   dokku_log_info2 "$PLUGIN_SERVICE container created: $SERVICE"
   service_info "$SERVICE"