diff --git a/src/header/mod.rs b/src/header/mod.rs
index 3c6ca29b..1c5c2216 100644
--- a/src/header/mod.rs
+++ b/src/header/mod.rs
@@ -594,6 +594,13 @@ mod tests {
         assert!(headers.get::<CrazyLength>().is_none());
     }
 
+    #[test]
+    fn test_trailing_whitespace() {
+        let headers = Headers::from_raw(&mut mem("Content-Length: 10   \r\n\r\n")).unwrap();
+        let ContentLength(_) = *headers.get::<ContentLength>().unwrap();
+        assert!(headers.get::<CrazyLength>().is_none());
+    }
+
     #[test]
     fn test_multiple_reads() {
         let headers = Headers::from_raw(&mut mem("Content-Length: 10\r\n\r\n")).unwrap();
diff --git a/src/http.rs b/src/http.rs
index d2809ce5..aa869069 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -544,6 +544,9 @@ pub fn read_header<R: Reader>(stream: &mut R) -> HttpResult<Option<RawHeaderLine
             }
         };
     }
+    // Remove optional trailing whitespace
+    let real_len = value.len() - value.iter().rev().take_while(|&&x| b' ' == x).count();
+    value.truncate(real_len);
 
     debug!("header value = {}", value[].to_ascii());