diff --git a/CHANGELOG.md b/CHANGELOG.md
index 700532931..5c1610db3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ emqttd ChangeLog
 
 Bugfix: issue #138 - when client disconnected normally, broker will not publish disconnected $SYS message
 
+Bugfix: fix websocket url in emqttd/priv/www/websocket.html
+
 Improve: issue #136 - $SYS topics result should not include $SYS messages
 
 
diff --git a/apps/emqttd/priv/www/websocket.html b/apps/emqttd/priv/www/websocket.html
index 7ac1fda17..eb7784226 100644
--- a/apps/emqttd/priv/www/websocket.html
+++ b/apps/emqttd/priv/www/websocket.html
@@ -31,7 +31,7 @@
       return document.getElementById(id);
     }
     function go() {
-        ws = new WebSocket("ws://" + location.host + "/mqtt/wsocket");
+        ws = new WebSocket("ws://" + location.host + "/mqtt");
         ws.onopen = function () {
           $('connstate').innerHTML = 'CONNECTED';
         }
diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard
deleted file mode 160000
index 300bb7445..000000000
--- a/plugins/emqttd_dashboard
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 300bb74452764ac27c261ae000495791397b2a28