diff --git a/content/pages/code-of-conduct.md b/content/pages/code-of-conduct.md
new file mode 100644
index 0000000..454c760
--- /dev/null
+++ b/content/pages/code-of-conduct.md
@@ -0,0 +1,18 @@
+Title: Code of Conduct
+URL: code-of-conduct.html
+save_as: code-of-conduct.html
+template: lucene/tlp/page
+
+For a large and diverse community like ours to be friendly, welcoming and respectful, we recognize the need for some guidelines. The project follows [Apache's Code of Conduct statement](https://www.apache.org/foundation/policies/conduct). Please take some time to read and understand it.
+
+If you feel there has been a violation of this code, please point out your concerns publicly in a friendly and matter of fact manner. Nonverbal communication is prone to misinterpretation and misunderstanding. Everyone has bad days and sometimes says things they regret later. Someone else's communication style may clash with yours, but the difference can be amicably resolved. After pointing out your concerns please be generous upon receiving an apology.
+
+Should there be repeated instances of code of conduct violations, or if there is an obvious and severe violation, the Lucene PMC may become involved.
+
+## Mailing list etiquette
+
+Written communication is hard and prone to misunderstandings. We recommend reading [ComDev's etiquette page](https://community.apache.org/contributors/etiquette) for some practical tips on how to improve.
+
+## The Apache Way
+
+As an Apache project we strive to follow [The Apache Way](http://theapacheway.com/). If you are new to the community or to open source in general, you may benefit from understanding our core values as a community, and why we operate the way we do. 
diff --git a/themes/lucene/templates/lucene/tlp/_sidebar.html b/themes/lucene/templates/lucene/tlp/_sidebar.html
index 4117b25..3b5dee0 100644
--- a/themes/lucene/templates/lucene/tlp/_sidebar.html
+++ b/themes/lucene/templates/lucene/tlp/_sidebar.html
@@ -17,6 +17,7 @@
   <li><a href="https://www.apache.org/licenses/">License</a></li>
   <li><a href="{{ SITEURL }}/whoweare.html">Who We are</a></li>
   <li><a href="{{ SITEURL }}/news.html">TLP News</a></li>
+  <li><a href="{{ SITEURL }}/code-of-conduct.html">Code of Conduct</a></li>
 </ul>
 
 <h1 id="events">Events<a class="headerlink" href="#events" title="Permanent link">¶</a></h1>