diff --git a/CHANGELOG.md b/CHANGELOG.md
index e12f3ae8..d5db9e5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * [#634](https://github.com/foosel/OctoPrint/pull/634) - Fixed missing `branch` fields in version dicts generated
   by versioneer
 * [IRC] Don't hiccup on slic3r filament_diameter comments generated for multi extruder setups
+* [ML] Fixed relative URL to sockjs endpoint, wasn't yet using the proper base url
 * Small fixes for timelapse creation:
   - [#344](https://github.com/foosel/OctoPrint/issues/344) - Made timelapses capable of coping with missing captures in between by decrementing the image counter again if there
     was an error fetching the latest image from the snapshot URL (backport of [1a7a468](https://github.com/foosel/OctoPrint/commit/1a7a468eb65fdf2a13b4c7a7723280e822c9c34b)
@@ -36,6 +37,8 @@
 * [#604](https://github.com/foosel/OctoPrint/issues/604) - Properly initialize settings basedir on server startup
 * [IRC] Also allow downloading .g files via Tornado
 
+([Commits](https://github.com/foosel/OctoPrint/compare/1.1.0...1.1.1))
+
 ## 1.1.0 (2014-09-03)
 
 ### New Features
diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index 28d5b4f3..fa0d72ec 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -37,7 +37,7 @@
             var CONFIG_GCODE_SIZE_THRESHOLD = {{ gcodeThreshold }};
             var CONFIG_GCODE_MOBILE_SIZE_THRESHOLD = {{ gcodeMobileThreshold }};
 
-            var SOCKJS_URI = window.location.protocol.slice(0, -1) + "://" + (window.document ? window.document.domain : window.location.hostname) + ":" + window.location.port + "/sockjs";
+            var SOCKJS_URI = "{{ url_for('index') }}" + "sockjs";
             var SOCKJS_DEBUG = {%  if debug -%} true; {% else %} false; {%- endif %}
         </script>
     </head>