diff --git a/Changelog.md b/Changelog.md
index e2543a0c2..46b112e62 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@
 * Fix medium and small avatar URLs when using Camo [#5883](https://github.com/diaspora/diaspora/pull/5883)
 * Improve output of script/server [#5885](https://github.com/diaspora/diaspora/pull/5885)
 * Fix CSS for bold links [#5887](https://github.com/diaspora/diaspora/pull/5887)
+* Correctly handle IE8 in the chrome frame middleware [#5878](https://github.com/diaspora/diaspora/pull/5878)
 
 ## Features
 * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843)
diff --git a/lib/rack/chrome_frame.rb b/lib/rack/chrome_frame.rb
index a81c7d12e..3e4955cf8 100644
--- a/lib/rack/chrome_frame.rb
+++ b/lib/rack/chrome_frame.rb
@@ -65,7 +65,7 @@ module Rack
     end
 
     def ie_version(ua_string)
-      ua_string.match(/MSIE (\S+)/)[1].to_f
+      ua_string.match(/MSIE ?(\S+)/)[1].to_f
     end
   end
 end
diff --git a/spec/lib/rack/chrome_frame_spec.rb b/spec/lib/rack/chrome_frame_spec.rb
index e3ae4a714..e7feaf15d 100644
--- a/spec/lib/rack/chrome_frame_spec.rb
+++ b/spec/lib/rack/chrome_frame_spec.rb
@@ -18,7 +18,7 @@ describe Rack::ChromeFrame do
   context "non-IE browser" do
     let(:ua_string) { "another browser chromeframe" }
 
-    it "shouldn't complain about the browser" do
+    it "shouldn't complain about the browser and shouldn't have chrome frame" do
       expect(subject.body).not_to match(/chrome=1/)
       expect(subject.body).not_to match(/Diaspora doesn't support your version of Internet Explorer/)
     end
@@ -27,7 +27,7 @@ describe Rack::ChromeFrame do
   context "IE8 without chromeframe" do
     let(:ua_string) { "MSIE 8" }
 
-    it "shouldn't complain about the browser" do
+    it "shouldn't complain about the browser and shouldn't have chrome frame" do
       expect(subject.body).not_to match(/chrome=1/)
       expect(subject.body).not_to match(/Diaspora doesn't support your version of Internet Explorer/)
     end
@@ -36,7 +36,7 @@ describe Rack::ChromeFrame do
   context "IE7 without chromeframe" do
     let(:ua_string) { "MSIE 7" }
 
-    it "shouldn't complain about the browser" do
+    it "should complain about the browser" do
       expect(subject.body).not_to match(/chrome=1/)
       expect(subject.body).to match(/Diaspora doesn't support your version of Internet Explorer/)
     end
@@ -46,10 +46,18 @@ describe Rack::ChromeFrame do
   context "any IE with chromeframe" do
     let(:ua_string) { "MSIE number chromeframe" }
 
-    it "shouldn't complain about the browser" do
+    it "shouldn't complain about the browser and should have chrome frame" do
       expect(subject.body).to match(/chrome=1/)
       expect(subject.body).not_to match(/Diaspora doesn't support your version of Internet Explorer/)
     end
     specify {expect(@response.headers["Content-Length"]).to eq(@response.body.length.to_s)}
   end
+
+  context "Specific case with no space after MSIE" do
+    let(:ua_string) { "Mozilla/4.0 (compatible; MSIE8.0; Windows NT 6.0) .NET CLR 2.0.50727" }
+
+    it "shouldn't complain about the browser" do
+      expect(subject.body).not_to match(/Diaspora doesn't support your version of Internet Explorer/)
+    end
+  end
 end