diff --git a/install_prereqs.sh b/install_prereqs.sh
index 05fa03a6..c4898991 100755
--- a/install_prereqs.sh
+++ b/install_prereqs.sh
@@ -157,6 +157,10 @@ case $DISTRO in
 		echo 'git, svn-devel, autotools, gcc, g++, boost, openssl-devel and libpng-devel. For tracing to work, libdwarf is also required'
 		exit 1
 		;;
+        Debian*8*)
+		apt-get -y install git-core build-essential openssl libpng-dev libboost-all-dev libpng-dev libdwarf-dev subversion subversion-tools cmake
+		exit 1
+		;;
 	*)
 		echo 'Distro not found! You shall need git, svn-devel, autotools, gcc, g++, boost, openssl-devel and libpng-devel to successfully build this package.'
 		echo 'For tracing to work, libdwarf is also required.'
diff --git a/wsgate/wsgateEHS.cpp b/wsgate/wsgateEHS.cpp
index f1139454..873c1753 100644
--- a/wsgate/wsgateEHS.cpp
+++ b/wsgate/wsgateEHS.cpp
@@ -536,8 +536,11 @@ namespace wsgate{
         MimeType mt = simpleMime(to_lower_copy(basename));
         if (HTML == mt) {
             ostringstream oss;
-
-            oss << (request->Secure() ? "wss://" : "ws://") << thisHost << "/wsgate";
+            bool is_secure = request->Secure();
+            if (request->Headers("X-Forwarded-Proto").compare("https") == 0) {
+              is_secure=true;
+            }
+            oss << (is_secure ? "wss://" : "ws://") << thisHost << "/wsgate";
 
             replace_all(body, "%WSURI%", oss.str());
             replace_all(body, "%JSDEBUG%", (bDynDebug ? "-debug" : ""));