diff --git a/Slim/Http/Uri.php b/Slim/Http/Uri.php
index 31f202a72..0aa5671e8 100644
--- a/Slim/Http/Uri.php
+++ b/Slim/Http/Uri.php
@@ -203,6 +203,7 @@ public static function createFromEnvironment(Environment $env)
         // parse_url() requires a full URL. As we don't extract the domain name or scheme,
         // we use a stand-in.
         $requestUri = parse_url('http://example.com' . $env->get('REQUEST_URI'), PHP_URL_PATH);
+        $requestUri = rawurldecode($requestUri);
 
         $basePath = '';
         $virtualPath = $requestUri;
diff --git a/tests/Http/UriTest.php b/tests/Http/UriTest.php
index 0d8602bfb..b844a4e8a 100644
--- a/tests/Http/UriTest.php
+++ b/tests/Http/UriTest.php
@@ -562,6 +562,20 @@ public function testCreateEnvironmentWithBasePath()
         $this->assertEquals('http://localhost/foo/bar', (string) $uri);
     }
 
+    public function testCreateEnvironmentWithBasePathContainingSpace()
+    {
+        $environment = Environment::mock([
+            'SCRIPT_NAME' => "/f'oo bar/index.php",
+            'REQUEST_URI' => "/f'oo%20bar/baz",
+        ]);
+        $uri = Uri::createFromEnvironment($environment);
+
+        $this->assertEquals("/f%27oo%20bar", $uri->getBasePath());
+        $this->assertEquals('baz', $uri->getPath());
+
+        $this->assertEquals('http://localhost/f%27oo%20bar/baz', (string) $uri);
+    }
+
     public function testGetBaseUrl()
     {
         $environment = Environment::mock([