diff --git lib/webrick/httprequest.rb lib/webrick/httprequest.rb
index 87dc879175..6af0cee97d 100644
--- lib/webrick/httprequest.rb
+++ lib/webrick/httprequest.rb
@@ -226,9 +226,9 @@ def parse(socket=nil)
         raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
       end
 
-      if /close/io =~ self["connection"]
+      if /\Aclose\z/io =~ self["connection"]
         @keep_alive = false
-      elsif /keep-alive/io =~ self["connection"]
+      elsif /\Akeep-alive\z/io =~ self["connection"]
         @keep_alive = true
       elsif @http_version < "1.1"
         @keep_alive = false
@@ -503,7 +503,7 @@ def read_body(socket, block)
       return unless socket
       if tc = self['transfer-encoding']
         case tc
-        when /chunked/io then read_chunked(socket, block)
+        when /\Achunked\z/io then read_chunked(socket, block)
         else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
         end
       elsif self['content-length'] || @remaining_size
diff --git lib/webrick/httpservlet/filehandler.rb lib/webrick/httpservlet/filehandler.rb
index 7cac05d818..601882ef4c 100644
--- lib/webrick/httpservlet/filehandler.rb
+++ lib/webrick/httpservlet/filehandler.rb
@@ -214,7 +214,7 @@ def initialize(server, root, options={}, default=Config::FileHandler)
 
       def service(req, res)
         # if this class is mounted on "/" and /~username is requested.
-        # we're going to override path information before invoking service.
+        # we're going to override path informations before invoking service.
         if defined?(Etc) && @options[:UserDir] && req.script_name.empty?
           if %r|^(/~([^/]+))| =~ req.path_info
             script_name, user = $1, $2
diff --git lib/webrick/version.rb lib/webrick/version.rb
index 5a21f82d93..7bcdd5b943 100644
--- lib/webrick/version.rb
+++ lib/webrick/version.rb
@@ -14,5 +14,5 @@ module WEBrick
   ##
   # The WEBrick version
 
-  VERSION      = "1.6.0"
+  VERSION      = "1.6.1"
 end