diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
old mode 100755
new mode 100644
index 0738039472f65d2c02c94903d4a80f15d4072fd3..aa75277efc805624b57a032b42d256e88e5a134d
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -1123,6 +1123,16 @@ check_state() {
 		echo 
 	fi
 
+	if [ -f /var/www/bigbluebutton/check/conf/config.xml ]; then
+		CHECK_HOST=$(cat /var/www/bigbluebutton/check/conf/config.xml  | grep "<uri>rtmp" | head -1 | sed  's/.*rtmp:\/\///g' | sed 's/\/.*//g' | tr -d '\015')
+		echo "# Warning: The client self check is installed and accessible from:"
+		echo "#"
+		echo "#    http://$CHECK_HOST/check"
+		echo "#"
+		echo 
+
+	fi
+
 	if [ -f ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties ]; then
 		LTI_URL='http://'$(cat ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties | sed -n '/^ltiEndPoint/{s/^.*=//;p}')'/lti/tool'
 		echo "# Warning: The IMS Learning Tools Integration (LTI) is accessible from:"
@@ -1234,6 +1244,13 @@ if [ $CHECK ]; then
 		echo "                           api url: $LTI_URL"
 	fi
 
+	if [ -f /var/www/bigbluebutton/check/conf/config.xml ]; then
+		CHECK_URL=$(cat /var/www/bigbluebutton/check/conf/config.xml  | grep "<uri>rtmp" | head -1 | sed  's/.*rtmp:\/\///g' | sed 's/\/.*//g' | tr -d '\015')
+		echo
+		echo "/var/www/bigbluebutton/check/conf/config.xml (client check)"
+		echo "                      client check: $CHECK_URL"
+	fi
+
 	CONFERENCING_MODULE="FreeSWITCH"
 
 	echo
@@ -1473,6 +1490,12 @@ if [ -n "$HOST" ]; then
         done
 	echo 
 
+	if [ -f /var/www/bigbluebutton/check/conf/config.xml ]; then
+		echo "Assigning $HOST for client self check to /var/www/bigbluebutton/check/conf/config.xml"
+		sed -i "s/rtmp:\/\/\([^\"\/]*\)\//rtmp:\/\/$HOST\//g" /var/www/bigbluebutton/check/conf/config.xml
+		sed -i "s/rtmpt:\/\/\([^\"\/]*\)\//rtmpt:\/\/$HOST\//g" /var/www/bigbluebutton/check/conf/config.xml
+	fi
+
 	echo "Restarting the bigbluebutton server ..."
 	stop_bigbluebutton
 	echo