diff --git a/_data/theme.yml b/_data/theme.yml
index 669b16dbb87cd..ee40da9bae13b 100644
--- a/_data/theme.yml
+++ b/_data/theme.yml
@@ -16,6 +16,7 @@ social:
   #linkedin: philipjagielski
   #gplus: 110552447039675960964
   #gravatar: 86e6ff8f75f9daef42d53b7f8002fd95
+  #flickr: johndoe
 
 # "Hi, I'm _______"
 name: Matt Swanson
@@ -26,4 +27,4 @@ tagline: "weak opinions, strongly held"
 google_analytics_key: UA-xxxx-x
 
 # Toggle "Postings are my own" disclaimer in footer
-show_disclaimer: true
\ No newline at end of file
+show_disclaimer: true
diff --git a/_includes/social.html b/_includes/social.html
index 53f62d3a5e222..873d9d09044d7 100644
--- a/_includes/social.html
+++ b/_includes/social.html
@@ -60,6 +60,12 @@
   </a>
   {% endif %}
 
+  {% if site.data.theme.social.flickr %}
+  <a title="{{ site.data.theme.name }} on Flickr" href="https://www.flickr.com/photos/{{ site.data.theme.social.flickr }}">
+    <i class="fa fa-flickr"></i>
+  </a>
+  {% endif %}
+
   <a title="Atom feed" id="atom" href="/atom.xml">
     <i class="fa fa-rss-square"></i>
   </a>