diff --git a/README.md b/README.md
index ae694cc..1972de2 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@ You can see an up-to-date copy of the master branch running on http://rewrite.mi
 (There's also ```install.sh``` and ```start.sh```, but they may not for your installations.)
 
 #### TODO
-- Add auto-reconnect to frontend.
 - Add public API (similiar to old server.json)
 - Add ingame server, similiar to old mc.minetrack.me
 - History graphs (database?)
diff --git a/assets/js/site.js b/assets/js/site.js
index fe5fabf..d88087c 100644
--- a/assets/js/site.js
+++ b/assets/js/site.js
@@ -160,7 +160,11 @@ function safeName(name) {
 }
 
 $(document).ready(function() {
-	var socket = io.connect();
+	var socket = io.connect({
+        'reconnect': true,
+        'reconnection delay': 1000,
+        'max reconnection attempts': 10
+    });
 
     var mojangServicesUpdater;
     var sortServersTask;