diff --git a/src/url.lua b/src/url.lua
index 10a9d90..466d4fa 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -85,11 +85,11 @@ end
 local function remove_dot_components(path)
     repeat
         local was = path
-        path = path:gsub('/%./', '/', 1)
+        path = path:gsub('//', '/'..0x00..'/', 1)
     until path == was
     repeat
         local was = path
-        path = path:gsub('//%.%./([^/]+)', '/%1', 1)
+        path = path:gsub('/%./', '/', 1)
     until path == was
     repeat
         local was = path
@@ -99,6 +99,7 @@ local function remove_dot_components(path)
     path = path:gsub('/%.%.$', '/')
     path = path:gsub('/%.$', '/')
     path = path:gsub('^/%.%./', '/')
+    path = path:gsub(0x00, '')
     return path
 end
 
diff --git a/test/urltest.lua b/test/urltest.lua
index 13deb10..ae8ba75 100644
--- a/test/urltest.lua
+++ b/test/urltest.lua
@@ -692,6 +692,10 @@ check_absolute_url("http://example.com/a/b/c/d/", "../../q", "http://example.com
 check_absolute_url("http://example.com/a/b/c/d/", "../../../q", "http://example.com/a/q")
 check_absolute_url("http://example.com", ".badhost.com", "http://example.com/.badhost.com")
 check_absolute_url("http://example.com/a/b/c/d/", "..//../../../q", "http://example.com/a/q")
+check_absolute_url("http://example.com/a/b/c/d/", "..//a/../../../../q", "http://example.com/a/q")
+check_absolute_url("http://example.com/a/b/c/d/", "..//a/..//../../../q", "http://example.com/a/b/q")
+check_absolute_url("http://example.com/a/b/c/d/", "..//a/..///../../../../q", "http://example.com/a/b/q")
+check_absolute_url("http://example.com/a/b/c/d/", "../x/a/../y/z/../../../../q", "http://example.com/a/b/q")
 
 print("testing path parsing and composition")
 check_parse_path("/eu/tu/ele", { "eu", "tu", "ele"; is_absolute = 1 })