diff --git a/_config.yml b/_config.yml
index 4f6fcd2..179c687 100644
--- a/_config.yml
+++ b/_config.yml
@@ -17,6 +17,7 @@ github:
     repo:               bigchaindb
 medium:                 the-bigchaindb-blog
 googlegroup:            bigchaindb
+gitter:                 bigchaindb
 disqus:                 bigchain
 
 address:
diff --git a/_src/_assets/images/gitter.svg b/_src/_assets/images/gitter.svg
new file mode 100644
index 0000000..fae8223
--- /dev/null
+++ b/_src/_assets/images/gitter.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #ed1a55;
+        stroke-linecap: square;
+        stroke-width: 2px;
+      }
+    </style>
+  </defs>
+  <title>gitter</title>
+    <g id="gitter">
+      <path class="cls-1" d="M8,4V19.5"/>
+      <path class="cls-1" d="M12,4V19.5"/>
+      <path class="cls-1" d="M16,4v7"/>
+      <path class="cls-1" d="M4,1V11"/>
+    </g>
+</svg>
diff --git a/_src/_assets/styles/_page-community.scss b/_src/_assets/styles/_page-community.scss
index 0c4908f..e98b54e 100644
--- a/_src/_assets/styles/_page-community.scss
+++ b/_src/_assets/styles/_page-community.scss
@@ -46,6 +46,10 @@
                 fill: lighten($brand-primary, 10%);
                 filter: drop-shadow(0 1px 4px rgba($brand-main-blue-dark, .4));
                 transform: translateY(-1px);
+
+                &.icon--gitter {
+                    stroke: lighten($brand-primary, 10%);
+                }
             }
         }
 
@@ -63,6 +67,10 @@
             fill: $brand-primary;
             width: 1.5rem;
             height: 1.5rem;
+
+            &.icon--gitter {
+                stroke: $brand-primary;
+            }
         }
     }
 }
diff --git a/_src/_assets/styles/bigchain/_icons.scss b/_src/_assets/styles/bigchain/_icons.scss
index d8e62f6..0236bbd 100644
--- a/_src/_assets/styles/bigchain/_icons.scss
+++ b/_src/_assets/styles/bigchain/_icons.scss
@@ -18,6 +18,10 @@
     stroke: none;
     fill: $text-color;
     margin-bottom: -2px;
+
+    .icon--gitter {
+        stroke: $text-color;
+    }
 }
 
 .icon--sm {
diff --git a/_src/_data/menus.yml b/_src/_data/menus.yml
index 114f199..77e025a 100644
--- a/_src/_data/menus.yml
+++ b/_src/_data/menus.yml
@@ -22,6 +22,8 @@ community:
       url: https://github.com/bigchaindb
     - title: Twitter
       url: https://twitter.com/BigchainDB
+    - title: Gitter
+      url: https://gitter.im/bigchaindb
     - title: Google Group
       url: https://groups.google.com/forum/#!forum/bigchaindb
 
diff --git a/_src/community.html b/_src/community.html
index 1a1726a..25fce06 100644
--- a/_src/community.html
+++ b/_src/community.html
@@ -18,8 +18,14 @@ js: page-community.min.js
 
         <div class="grid grid--full grid-small--fit grid--gutters">
             <div class="grid__col">
-                <h1>Google Group</h1>
-                <p>Participate in our Google Group</p>
+                <h1>Join the discussion</h1>
+                <p>Participate via Gitter or Google Group</p>
+                <a class="social-link" href="https://gitter.im/{{ site.gitter }}">
+                    <svg class="icon icon--social icon--gitter" aria-labelledby="title">
+                        <title>Gitter</title>
+                        <use xlink:href="/assets/img/sprite.svg#gitter"></use>
+                    </svg>
+                </a>
                 <a class="social-link" href="https://groups.google.com/forum/#!forum/{{ site.googlegroup }}">
                     <svg class="icon icon--social icon--github" aria-labelledby="title">
                         <title>Google Group</title>
@@ -28,7 +34,7 @@ js: page-community.min.js
                 </a>
             </div>
             <div class="grid__col">
-                <h1>Social</h1>
+                <h1>Follow</h1>
                 <p>Follow us for the latest updates</p>
                 <p>
                     <a class="social-link" href="https://github.com/{{ site.github.org }}">