diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..55203be74
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+# Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/pages/876921332402685/open-source-code-of-conduct) so that you can understand what actions will and will not be tolerated.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 78b82767a..bec43eca9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,7 +49,7 @@ make devsetup
 - To switch the default build mode to flambda disabled, you can `export BUILD_MODE=default` in your
   shell.
 
-## Hacking on the Code in facebook-clang-plugins 
+## Hacking on the Code in facebook-clang-plugins
 
 Infer uses `ASTExporter` from the [facebook-clang-plugins](https://github.com/facebook/facebook-clang-plugins)
 repository. To change that part of the code:
@@ -61,8 +61,11 @@ repository. To change that part of the code:
 We require contributors to sign our Contributor License Agreement. In
 order for us to review and merge your code, please sign up at
 https://code.facebook.com/cla. If you have any questions, please drop
-us a line at cla@fb.com. Thanks!
+us a line at cla@fb.com.
 
+You are also expected to follow the [Code of Conduct](CODE_OF_CONDUCT.md), so please read that if you are a new contributor.
+
+Thanks!
 
 ## Coding Style