diff --git a/content/contents.lr b/content/contents.lr
index c39725fa..cfbc2eb1 100644
--- a/content/contents.lr
+++ b/content/contents.lr
@@ -37,6 +37,9 @@ contents:
           data-count-api="/repos/lektor/lektor#stargazers_count"
           data-count-aria-label="# stargazers on GitHub"
           aria-label="Star lektor/lektor on GitHub">Star</a>
+        <li><a href="https://gitter.im/lektor/lektor"><img
+          src="https://badges.gitter.im/lektor/lektor.svg"
+          alt="Join the chat at https://gitter.im/lektor/lektor"></a>
       </ul>
     </div>
   </div>
diff --git a/templates/layout.html b/templates/layout.html
index 50c750f8..7c884b8b 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -56,6 +56,8 @@
             ><i class="fa fa-bug"></i></a>
           <a href="https://twitter.com/getlektor" title="Find Lektor on Twitter"
             ><i class="fa fa-twitter"></i></a>
+          <a href="https://gitter.im/lektor/lektor" title="Chat on Gitter"
+            ><i class="fa fa-comment"></i></a>
           {%- if this.path %}
           <a href="https://github.com/lektor/lektor-website/tree/master/content{{ this.path
             }}/contents.lr" title="View source for this page"><i class="fa fa-code"></i></a>