diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php
index 25e5bfb6e5..c49e29c20c 100644
--- a/phpBB/phpbb/avatar/driver/gravatar.php
+++ b/phpBB/phpbb/avatar/driver/gravatar.php
@@ -21,7 +21,7 @@ class gravatar extends \phpbb\avatar\driver\driver
 	/**
 	* The URL for the gravatar service
 	*/
-	const GRAVATAR_URL = '//secure.gravatar.com/avatar/';
+	const GRAVATAR_URL = '//gravatar.com/avatar/';
 
 	/**
 	* {@inheritdoc}
@@ -175,7 +175,7 @@ class gravatar extends \phpbb\avatar\driver\driver
 		global $phpbb_dispatcher;
 
 		$url = self::GRAVATAR_URL;
-		$url .=  md5(strtolower(trim($row['avatar'])));
+		$url .= hash('sha256', strtolower(trim($row['avatar'])));
 
 		if ($row['avatar_width'] || $row['avatar_height'])
 		{
diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php
index 383664fe9c..a79e0d5115 100644
--- a/tests/avatar/driver_gravatar_test.php
+++ b/tests/avatar/driver_gravatar_test.php
@@ -207,7 +207,7 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case
 		];
 
 		$this->assertEquals([
-			'src'		=> '//secure.gravatar.com/avatar/dc8a42aba3651b0b1f088ef928ff3b1d?s=70',
+			'src'		=> '//gravatar.com/avatar/e0ee9d02824d4320a999507150c5b8a371c635c41f645ba3a7205f36384dc199?s=70',
 			'width'		=> '70',
 			'height'	=> '60',
 		], $this->gravatar->get_data($row));