diff --git a/README.md b/README.md
index 26fc7b7..ce4eb71 100755
--- a/README.md
+++ b/README.md
@@ -75,6 +75,8 @@ The theme contains documentation in the form of [blog posts](https://panossakkos
 ![Categories](https://dl.dropboxusercontent.com/u/8522559/personal-jekyll-theme/categories.jpg)
 ### 404
 ![404](https://dl.dropboxusercontent.com/u/8522559/personal-jekyll-theme/404.jpg)
+### Keybase
+![Keybase](http://i68.tinypic.com/245xyd2.png)
 ### Mobile rendering
 ![Web App](https://dl.dropboxusercontent.com/u/8522559/personal-jekyll-theme/web-app.jpg)
 ### Web App mode
diff --git a/_config.yml b/_config.yml
index 9444854..273fa65 100755
--- a/_config.yml
+++ b/_config.yml
@@ -161,6 +161,14 @@ social:
 
 404-img: "/img/labtocat.png"
 
+##################
+# GPG on Keybase #
+##################
+
+keybase-username: johnsmith
+keybase-in-social: True
+keybase-in-footer: True
+
 ################################################################################
 
 # NB! Tread carefully if you want to change the variables below this point!
diff --git a/_includes/footer.html b/_includes/footer.html
index 7ae51fc..91ff1aa 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,4 @@
-
- <!-- Footer Start -->
+<!-- Footer Start -->
 
 <footer>
 
@@ -8,7 +7,11 @@
     <p><br><br></p>
 
     <div class="container text-center">
-      <p>Copyright &copy; {{ site.author }} {{ site.time | date: "%Y" }}</p>
+        <p>Copyright &copy; {{ site.author }} {{ site.time | date: "%Y" }}</p>
+        {% if site.keybase-in-footer %}
+        <p style="font-size: 16px;"><a href="https://keybase.io/{{site.keybase-username}}" target="_blank"><i
+                class="fa fa-key"></i> {{site.keybase-username}} on Keybase</a></p>
+        {% endif %}
     </div>
 </footer>
 
diff --git a/_includes/social-buttons.html b/_includes/social-buttons.html
index 6b90319..7dbbf36 100644
--- a/_includes/social-buttons.html
+++ b/_includes/social-buttons.html
@@ -1,10 +1,12 @@
-
 <!-- Social Buttons Start -->
 
 <ul class="list-inline social-buttons">
-  {% for network in site.social %}
+    {% for network in site.social %}
     <li><a href="{{ network.url }}" target="_blank"><i class="fa fa-{{ network.title }} fa-fw"></i></a></li>
-  {% endfor %}
+    {% endfor %}
+    {% if site.keybase-in-social %}
+    <li><a href="https://keybase.io/{{site.keybase-username}}" target="_blank"><i class="fa fa-key fa-fw"></i></a></li>
+    {% endif %}
 </ul>
 
 <!-- Social Buttons End -->