diff --git a/CODE_OF_CONDUCT.rst b/CODE_OF_CONDUCT.rst
new file mode 100644
index 0000000000000000000000000000000000000000..de3e9f402589f09e0f39f13a51108463fd5e905d
--- /dev/null
+++ b/CODE_OF_CONDUCT.rst
@@ -0,0 +1,34 @@
+Contributor Code of Conduct
+===========================
+
+As contributors and maintainers of this project, we pledge to respect
+all people who contribute through reporting issues, posting feature
+requests, updating documentation, submitting pull requests or patches,
+and other activities.
+
+We are committed to making participation in this project a
+harassment-free experience for everyone, regardless of level of
+experience, gender, gender identity and expression, sexual orientation,
+disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of
+sexual language or imagery, derogatory comments or personal attacks,
+trolling, public or private harassment, insults, or other unprofessional
+conduct.
+
+Project maintainers have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct. Project
+maintainers or contributors who do not follow the Code of Conduct may be
+removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported by emailing `John Chilton <jmchilton@gmail.com>`__. To
+report an issue involving John Chilton please email both `Dave Clements 
+<mailto:clements@galaxyproject.org>`__ (the Outreach Coordinator for
+the Galaxy project) and `Anton Nekrutenko <mailto:anton@bx.psu.edu>`__
+(John Chilton's supervisor and a principle investigator for the Galaxy
+project).
+
+This Code of Conduct is adapted from the `khmer Contributor Code of Conduct
+<https://github.com/ged-lab/khmer/blob/master/CODE_OF_CONDUCT.rst>`__.
diff --git a/docs/conduct.rst b/docs/conduct.rst
new file mode 100644
index 0000000000000000000000000000000000000000..96e0ba2f582a6ac5e8c4a7fcc09f261918c75620
--- /dev/null
+++ b/docs/conduct.rst
@@ -0,0 +1 @@
+.. include:: ../CODE_OF_CONDUCT.rst
diff --git a/docs/index.rst b/docs/index.rst
index ba34c774a123fee4a8d35d7ab5a56171a8c63065..d12d5e75df25389baa077d54b3a056a670f9a1b7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -16,6 +16,7 @@ Contents:
    job_managers
    galaxy_conf
    upgrading
+   conduct
    contributing
    history