diff --git a/Rakefile b/Rakefile
index 4d98603b..127fcc67 100644
--- a/Rakefile
+++ b/Rakefile
@@ -32,7 +32,7 @@ end
 setup_extension("http11", "http11")
 
 name="mongrel"
-version="0.3.12.1"
+version="0.3.12.2"
 
 setup_gem(name, version) do |spec|
   spec.summary = "A small fast HTTP library and server that runs Rails, Camping, and Nitro apps."
diff --git a/doc/site/src/faq.page b/doc/site/src/faq.page
index 9bcab425..a21035f4 100644
--- a/doc/site/src/faq.page
+++ b/doc/site/src/faq.page
@@ -98,6 +98,6 @@ h2. Deployment
 
 h3. Q: How do I deploy Mongrel in production?
 
-Take a look at the "HOWTO":docs/howto.html and the "Lighttpd":docs/lighttpd.page
+Take a look at the "HOWTO":docs/howto.html and the "Lighttpd":docs/lighttpd.html
 instructions for more information on this.
 
diff --git a/ext/http11/http11.c b/ext/http11/http11.c
index 55ecc0fd..9e2cc6fe 100644
--- a/ext/http11/http11.c
+++ b/ext/http11/http11.c
@@ -520,7 +520,7 @@ void Init_http11()
   DEF_GLOBAL(server_protocol, "SERVER_PROTOCOL");
   DEF_GLOBAL(server_protocol_value, "HTTP/1.1");
   DEF_GLOBAL(http_host, "HTTP_HOST");
-  DEF_GLOBAL(mongrel_version, "Mongrel 0.3.12.1");
+  DEF_GLOBAL(mongrel_version, "Mongrel 0.3.12.2");
   DEF_GLOBAL(server_software, "SERVER_SOFTWARE");
   DEF_GLOBAL(port_80, "80");
 
diff --git a/ext/http11/http11_parser.rl b/ext/http11/http11_parser.rl
index af3a444c..6a256a61 100644
--- a/ext/http11/http11_parser.rl
+++ b/ext/http11/http11_parser.rl
@@ -99,7 +99,7 @@
 
         field_value = any* >start_value %write_value;
 
-        message_header = field_name ":" field_value :> CRLF;
+        message_header = field_name ":" field_value $0 CRLF >1;
 	
         Request = Request_Line (message_header)* ( CRLF @done);
 
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 78aad73a..c2995e3b 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -99,7 +99,7 @@ module Mongrel
     # The original URI requested by the client.  Passed to URIClassifier to build PATH_INFO and SCRIPT_NAME.
     REQUEST_URI='REQUEST_URI'.freeze
 
-    MONGREL_VERSION="0.3.12.1".freeze
+    MONGREL_VERSION="0.3.12.2".freeze
 
     # The standard empty 404 response for bad requests.  Use Error4040Handler for custom stuff.
     ERROR_404_RESPONSE="HTTP/1.1 404 Not Found\r\nConnection: close\r\nServer: #{MONGREL_VERSION}\r\n\r\nNOT FOUND".freeze