diff --git a/src/HttpsUri.php b/src/HttpsUri.php
new file mode 100644
index 0000000000..0d9f205a10
--- /dev/null
+++ b/src/HttpsUri.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-http for the canonical source repository
+ * @copyright Copyright (c) 2005-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-http/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Http;
+
+use Zend\Uri\Http as Http;
+
+class HttpsUri extends Http
+{
+    /**
+     * Get the scheme part of the URI
+     *
+     * @return string|null
+     */
+    public function getScheme()
+    {
+        return 'https';
+    }
+}
diff --git a/src/Request.php b/src/Request.php
index 9531fc5111..1605c7135b 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -12,6 +12,7 @@
 use Zend\Stdlib\RequestInterface;
 use Zend\Uri\Exception as UriException;
 use Zend\Uri\Http as HttpUri;
+use Zend\Http\HttpsUri;
 
 /**
  * HTTP Request
@@ -228,6 +229,11 @@ public function getUri()
         if ($this->uri === null || is_string($this->uri)) {
             $this->uri = new HttpUri($this->uri);
         }
+
+        $headers = $this->getHeaders()->toArray();
+        if (array_key_exists('X-Forwarded-Proto', $headers) && $headers['X-Forwarded-Proto'] === 'https') {
+            $this->uri = new HttpsUri($this->uri);
+        }
         return $this->uri;
     }
 
diff --git a/test/RequestTest.php b/test/RequestTest.php
index 0f977f08fa..b3a6c87159 100644
--- a/test/RequestTest.php
+++ b/test/RequestTest.php
@@ -323,6 +323,26 @@ public function testFromStringFactoryCreatesSingleObjectWithHeaderFolding()
         $this->assertEquals('foo-bar', $header->getFieldValue());
     }
 
+    public function testRequestUriRespectsXForwardedProtoHeader()
+    {
+        $request = Request::fromString("GET /foo HTTP/1.1");
+        $request->setUri("http://someurl.test");
+
+        $headers = new Headers();
+        $h = new GenericHeader('X-Forwarded-Proto', 'https');
+        $headers->addHeader($h);
+        $request->setHeaders($headers);
+        $this->assertEquals('https', $request->getUri()->getScheme());
+        echo "End of my test";
+    }
+
+    public function testRequestUriSchemeWithoutXForwardedProtoHeader()
+    {
+        $request = new Request();
+        $request->setUri("http://someurl.test");
+        $this->assertEquals('http', $request->getUri()->getScheme());
+    }
+
     /**
      * @see http://en.wikipedia.org/wiki/HTTP_response_splitting
      * @group ZF2015-04