diff --git a/README b/README
index 764ecc56..c9b3c729 100644
--- a/README
+++ b/README
@@ -16,11 +16,16 @@ Please consult the INSTALL and COPYING files for more information.
 Getting in Touch
 ----------------
 
- * Found a bug? Please report it!
-   https://wiki.gnome.org/Apps/Geary/ReportingABug
+ * Geary wiki:   https://wiki.gnome.org/Apps/Geary
  * Mailing list: http://mail.gnome.org/mailman/listinfo/geary-list
  * IRC Channel:  #geary on irc.gimp.org
 
+**Code Of Conduct**
+
+We follow the Contributor Covenant (See code-of-conduct.md) as our
+Code of Conduct. All communications in project spaces are expected to
+follow it.
+
 Contributing to Geary
 ---------------------
 
diff --git a/README.md b/README.md
index f5883ace..d6bab607 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,19 @@ Installation & Licensing
 Please consult the [INSTALL](./INSTALL) and [COPYING](./COPYING) files
 for more information.
 
+Getting in Touch
+----------------
+
+ * Geary wiki:   https://wiki.gnome.org/Apps/Geary
+ * Mailing list: http://mail.gnome.org/mailman/listinfo/geary-list
+ * IRC Channel:  [#geary on irc.gimp.org](irc://irc.gimp.org/%23geary)
+
+**Code Of Conduct**
+
+We follow the [Contributor Covenant](./code-of-conduct.md) as our
+Code of Conduct. All communications in project spaces are expected to
+follow it.
+
 Contributing to Geary
 ---------------------
 
@@ -33,13 +46,6 @@ Want to help improve Geary? Here are some ways to contribute:
  * Translating:   https://wiki.gnome.org/Apps/Geary/Translating
  * Join the mailing list or IRC channel and join in the discussion
 
-Getting in Touch
-----------------
-
- * Geary wiki:   https://wiki.gnome.org/Apps/Geary
- * Mailing list: http://mail.gnome.org/mailman/listinfo/geary-list
- * IRC Channel:  [#geary on irc.gimp.org](irc://irc.gimp.org/%23geary)
-
 ---
 Copyright 2016 Software Freedom Conservancy Inc.  
 Copyright 2017 Michael Gratton <mike@vee.net>
diff --git a/code-of-conduct.md b/code-of-conduct.md
new file mode 100644
index 00000000..1e4968ab
--- /dev/null
+++ b/code-of-conduct.md
@@ -0,0 +1,77 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+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, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
+