diff --git a/.gitignore b/.gitignore
index c091101bd9a785a91655841a29441d3655800789..263af105b2c65aa205caee0b2da1cebafa0c2163 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ LAYOUT.html
 FAQ.html
 DESIGN.html
 CONTRIBUTING.html
+CONDUCT.html
 *~
 *.pyc
 _site
diff --git a/CONDUCT.md b/CONDUCT.md
new file mode 100644
index 0000000000000000000000000000000000000000..607137e4bbf38159a0e19b4c1db64ff65ce11834
--- /dev/null
+++ b/CONDUCT.md
@@ -0,0 +1,13 @@
+# 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, ethnicity, 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 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 opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eb81382b4616f74c8a520a622fa0b971d1fdb2e8..3fa1e34ef310c1364ff02f6cd5b2b438f6dbe159 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,8 @@ and reviews of proposed changes are all equally welcome.
 By contributing,
 you are agreeing that Software Carpentry may redistribute your work under
 [these licenses][license].
+You also agree to abide by our
+[contributor code of conduct][conduct].
 
 ## Getting Started
 
@@ -38,6 +40,7 @@ you are agreeing that Software Carpentry may redistribute your work under
     lists the people currently responsible for managing this repository.
     Feel free to contact them if you have any questions or languishing pull requests.
 
+[conduct]: CONDUCT.md
 [lesson-template-issues]: https://github.com/swcarpentry/lesson-template/issues
 [license]: LICENSE.md
 [pro-git-chapter]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
diff --git a/Makefile b/Makefile
index aff75810fc6aa8eae7080ae8eb20ee2039aa2538..473b50740d7920fa6687ab0d9bce7c5a34ce1d44 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ DST_RMD = $(patsubst %.Rmd,%.md,$(SRC_RMD))
 
 # All Markdown files (hand-written and generated).
 ALL_MD = $(wildcard *.md) $(DST_RMD)
-EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md CONTRIBUTING.md
+EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md CONTRIBUTING.md CONDUCT.md
 SRC_MD = $(filter-out $(EXCLUDE_MD),$(ALL_MD))
 DST_HTML = $(patsubst %.md,%.html,$(SRC_MD))