diff --git a/CHANGES.md b/CHANGES.md
index 62d2e9157..8ac1724a3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
 # Changes
 
+## [0.7.14] - 2018-10-x
+
+### Fixed
+
+* HttpServer now treats streaming bodies the same for HTTP/1.x protocols. #549
+
 ## [0.7.13] - 2018-10-14
 
 ### Fixed
diff --git a/src/server/output.rs b/src/server/output.rs
index 104700d44..ac89d6440 100644
--- a/src/server/output.rs
+++ b/src/server/output.rs
@@ -300,10 +300,10 @@ impl Output {
             Some(true) => {
                 // Enable transfer encoding
                 info.length = ResponseLength::Chunked;
-                if version == Version::HTTP_11 {
-                    TransferEncoding::chunked(buf)
-                } else {
+                if version == Version::HTTP_2 {
                     TransferEncoding::eof(buf)
+                } else {
+                    TransferEncoding::chunked(buf)
                 }
             }
             Some(false) => TransferEncoding::eof(buf),
@@ -337,10 +337,10 @@ impl Output {
                 } else {
                     // Enable transfer encoding
                     info.length = ResponseLength::Chunked;
-                    if version == Version::HTTP_11 {
-                        TransferEncoding::chunked(buf)
-                    } else {
+                    if version == Version::HTTP_2 {
                         TransferEncoding::eof(buf)
+                    } else {
+                        TransferEncoding::chunked(buf)
                     }
                 }
             }