diff --git a/Contributing.md b/Contributing.md
index 4bc3aa7ce8d..ac3659c5cc7 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -6,6 +6,8 @@ contributing or need help with anything, please ping nrc on irc, #rust-dev-tools
 on irc.mozilla.org is probably the best channel. Feel free to also ask questions
 on issues, or file new issues specifically to get help.
 
+All contributors are expected to follow our [Code of
+Conduct](CODE_OF_CONDUCT.md).
 
 ## Test and file issues
 
diff --git a/README.md b/README.md
index 6fff71760d2..05dc7e9c3d4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@
 A tool for formatting Rust code according to style guidelines.
 
 If you'd like to help out (and you should, it's a fun project!), see
-[Contributing.md](Contributing.md).
+[Contributing.md](Contributing.md) and our [Code of
+Conduct](CODE_OF_CONDUCT.md).
 
 We are changing the default style used by rustfmt. There is an ongoing [RFC
 process][fmt rfcs]. The last version using the old style was 0.8.6. From 0.9