diff --git a/Gemfile b/Gemfile
index 5975be402..6b18827e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -109,7 +109,7 @@ gem 'faraday-stack'
 # web sockets
 
 gem 'em-synchrony', :platforms => :ruby_19
-gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485'
+gem 'em-websocket'
 
 ### GROUPS ####
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 27d9cf3da..deebb674a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,15 +47,6 @@ GIT
   specs:
     http_accept_language (1.0.1)
 
-GIT
-  remote: git://github.com/igrigorik/em-websocket
-  revision: e278f5a1c4db60be7485859520a069e08bfe1247
-  ref: e278f5a1c4db60be7485
-  specs:
-    em-websocket (0.2.0)
-      addressable (>= 2.1.1)
-      eventmachine (>= 0.12.9)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -169,6 +160,9 @@ GEM
     diff-lcs (1.1.3)
     em-synchrony (0.2.0)
       eventmachine (>= 0.12.9)
+    em-websocket (0.3.5)
+      addressable (>= 2.1.1)
+      eventmachine (>= 0.12.9)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
@@ -505,7 +499,7 @@ DEPENDENCIES
   devise_invitable (= 0.5.0)
   diaspora-client!
   em-synchrony
-  em-websocket!
+  em-websocket
   excon (= 0.2.4)
   factory_girl_rails
   faraday
diff --git a/script/websocket_server.rb b/script/websocket_server.rb
index 9a91cb61d..60f1f21f3 100644
--- a/script/websocket_server.rb
+++ b/script/websocket_server.rb
@@ -62,10 +62,10 @@ begin
         begin
           debug_pp ws.request
 
-          cookies = ws.request["Cookie"].split(';')
+          cookies = ws.request["cookie"].split(';')
           session_key = "_diaspora_session="
           enc_diaspora_cookie = cookies.detect{|c| c.include?(session_key)}.gsub(session_key,'')
-          cookie = Marshal.load(enc_diaspora_cookie.unpack("m*").first)
+          cookie = Marshal.load(enc_diaspora_cookie.strip.unpack("m*").first)
 
           debug_pp cookie