diff --git a/README.md b/README.md
index 2668be6..e8d8f5c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ PSR Http Message
 ================
 
 This repository holds all interfaces/classes/traits related to
-[PSR-7](http://www.php-fig.org/psr/psr-7/).
+[PSR-7](https://www.php-fig.org/psr/psr-7/).
 
 Note that this is not a HTTP message implementation of its own. It is merely an
 interface that describes a HTTP message. See the specification for more details.
@@ -13,4 +13,4 @@ Usage
 Before reading the usage guide we recommend reading the PSR-7 interfaces method list:
 
 * [`PSR-7 Interfaces Method List`](docs/PSR7-Interfaces.md)
-* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md)
\ No newline at end of file
+* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md)
diff --git a/composer.json b/composer.json
index b0d2937..630f349 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
diff --git a/docs/PSR7-Interfaces.md b/docs/PSR7-Interfaces.md
index 3a7e7dd..aa8757a 100644
--- a/docs/PSR7-Interfaces.md
+++ b/docs/PSR7-Interfaces.md
@@ -6,13 +6,13 @@ The interfaces defined in PSR-7 are the following:
 
 | Class Name | Description |
 |---|---|
-| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
-| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
-| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
-| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
-| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
-| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
-| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
+| [Psr\Http\Message\MessageInterface](https://www.php-fig.org/psr/psr-7/#31-psrhttpmessagemessageinterface) | Representation of a HTTP message |
+| [Psr\Http\Message\RequestInterface](https://www.php-fig.org/psr/psr-7/#32-psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
+| [Psr\Http\Message\ServerRequestInterface](https://www.php-fig.org/psr/psr-7/#321-psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
+| [Psr\Http\Message\ResponseInterface](https://www.php-fig.org/psr/psr-7/#33-psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
+| [Psr\Http\Message\StreamInterface](https://www.php-fig.org/psr/psr-7/#34-psrhttpmessagestreaminterface) | Describes a data stream |
+| [Psr\Http\Message\UriInterface](https://www.php-fig.org/psr/psr-7/#35-psrhttpmessageuriinterface) | Value object representing a URI. |
+| [Psr\Http\Message\UploadedFileInterface](https://www.php-fig.org/psr/psr-7/#36-psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
 
 ## `Psr\Http\Message\MessageInterface` Methods