diff --git a/_plugins/contributors.rb b/_plugins/contributors.rb
index 10434573..12cf15a7 100644
--- a/_plugins/contributors.rb
+++ b/_plugins/contributors.rb
@@ -55,9 +55,9 @@ module Jekyll
         x = {}
         x['name'] = name
         x['contributions'] = c['contributions']
-        # Set gravatar_id when available
-        if c.has_key?('gravatar_id') and c['gravatar_id'].is_a?(String) and /^[A-Za-z0-9\-]{1,150}$/.match(c['gravatar_id'])
-          x['gravatar_id'] = c['gravatar_id']
+        # Set avatar_url when available
+        if c.has_key?('avatar_url') and c['avatar_url'].is_a?(String) and /^https:\/\/avatars\.githubusercontent\.com\/u\/[0-9]{1,10}\?v=[0-9]{1,2}$/.match(c['avatar_url'])
+          x['avatar_url'] = c['avatar_url'] + '&size=16'
         end
         # Set login when available
         if c.has_key?('login') and c['login'].is_a?(String) and /^[A-Za-z0-9\-]{1,150}$/.match(c['login'])
diff --git a/_templates/about-us.html b/_templates/about-us.html
index 22539837..cd78ddfe 100644
--- a/_templates/about-us.html
+++ b/_templates/about-us.html
@@ -58,7 +58,7 @@ id: about-us
 <div class="contributors">
   {% for c in site.sitecontributors %}
   <div>
-    <div>{% if c.gravatar_id %}<img src="https://secure.gravatar.com/avatar/{{c.gravatar_id}}?s=140&amp;d=mm" alt="icon" />{% else %}<img alt="icon" />{% endif %}</div>
+    <div>{% if c.avatar_url %}<img src="{{c.avatar_url}}" alt="icon" />{% else %}<img alt="icon" />{% endif %}</div>
     <div><a{% if c.login %} href="https://github.com/{{c.login}}"{% endif %}>{{ c.name | htmlescape }}</a></div>
     <div>({{ c.contributions }})</div>
   </div>
diff --git a/_templates/development.html b/_templates/development.html
index 0e3466e2..b2b735ad 100755
--- a/_templates/development.html
+++ b/_templates/development.html
@@ -69,7 +69,7 @@ id: development
   <div class="contributors">
     {% for c in site.corecontributors %}
     <div>
-      <div>{% if c.gravatar_id %}<img src="https://secure.gravatar.com/avatar/{{c.gravatar_id}}?s=140&amp;d=mm" alt="icon" />{% else %}<img alt="icon" />{% endif %}</div>
+      <div>{% if c.avatar_url %}<img src="{{c.avatar_url}}" alt="icon" />{% else %}<img alt="icon" />{% endif %}</div>
       <div><a{% if c.login %} href="https://github.com/{{c.login}}"{% endif %}>{{ c.name | htmlescape }}</a></div>
       <div>({{ c.contributions }})</div>
     </div>