diff --git a/Hack/Handler/CGI.hs b/Hack/Handler/CGI.hs
--- a/Hack/Handler/CGI.hs
+++ b/Hack/Handler/CGI.hs
@@ -83,6 +83,8 @@
     helper' ('_':x:rest) = '-' : x : helper' rest
     helper' (x:rest) = toLower x : helper' rest
     helper' [] = []
+cleanupVarName "CONTENT_TYPE" = "Content-Type"
+cleanupVarName "CONTENT_LENGTH" = "Content-Length"
 cleanupVarName x = x
 
 -- | Case insensitive lookup
diff --git a/hack-handler-cgi.cabal b/hack-handler-cgi.cabal
--- a/hack-handler-cgi.cabal
+++ b/hack-handler-cgi.cabal
@@ -1,5 +1,5 @@
 name:            hack-handler-cgi
-version:         0.0.2
+version:         0.0.3
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>