diff --git a/.gitignore b/.gitignore
index db969f902..89395b7cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 output
 schema/validate
+code-of-conduct.md
diff --git a/Makefile b/Makefile
index 91efe82e9..e270ca0bd 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ default: docs
 .PHONY: docs
 docs: output/docs.pdf output/docs.html
 
-output/docs.pdf:
+output/docs.pdf: $(DOC_FILES)
 	mkdir -p output/ && \
 	$(DOCKER) run \
 	-it \
@@ -32,7 +32,7 @@ output/docs.pdf:
 	-u $(shell id -u) \
 	vbatts/pandoc -f markdown_github -t latex -o /$@ $(patsubst %,/input/%,$(DOC_FILES))
 
-output/docs.html:
+output/docs.html: $(DOC_FILES)
 	mkdir -p output/ && \
 	$(DOCKER) run \
 	-it \
@@ -42,6 +42,8 @@ output/docs.html:
 	-u $(shell id -u) \
 	vbatts/pandoc -f markdown_github -t html5 -o /$@ $(patsubst %,/input/%,$(DOC_FILES))
 
+code-of-conduct.md:
+	curl -o $@ https://raw.githubusercontent.com/opencontainers/tob/d2f9d68c1332870e40693fe077d311e0742bc73d/code-of-conduct.md
 
 HOST_GOLANG_VERSION	= $(shell go version | cut -d ' ' -f3 | cut -c 3-)
 # this variable is used like a function. First arg is the minimum version, Second arg is the version to be checked.
diff --git a/README.md b/README.md
index ed415e8ab..05c6462f6 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ The [Open Container Initiative](http://www.opencontainers.org/) develops specifi
 Table of Contents
 
 - [Introduction](README.md)
-  - [Code of Conduct](code-of-conduct.md)
+  - [Code of Conduct](#code-of-conduct)
   - [Container Principles](principles.md)
   - [Style and Conventions](style.md)
   - [Roadmap](ROADMAP.md)
@@ -59,7 +59,7 @@ The specification and code is licensed under the Apache 2.0 license found in the
 
 ## Code of Conduct
 
-Participation in the OpenContainers community is governed by [OpenContainer's Code of Conduct](https://github.com/opencontainers/tob/blob/master/code-of-conduct.md).
+Participation in the OpenContainers community is governed by [OpenContainer's Code of Conduct](https://github.com/opencontainers/tob/blob/d2f9d68c1332870e40693fe077d311e0742bc73d/code-of-conduct.md).
 
 ## Discuss your design
 
diff --git a/code-of-conduct.md b/code-of-conduct.md
deleted file mode 100644
index 06cb2b83a..000000000
--- a/code-of-conduct.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# OpenContainers Code of Conduct
-
-Behave as a community member, follow the code of conduct.
-
-## Code of Conduct
-
-The OpenContainers community is made up of a mixture of professionals and volunteers from all over the world.
-
-When we disagree, we try to understand why.
-Disagreements, both social and technical, happen all the time and OpenContainers is no exception.
-It is important that we resolve disagreements and differing views constructively.
-
-This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
-Participants should be aware of these concerns.
-
-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, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-The OpenContainers team does not condone any statements by speakers contrary to these standards.
-The OpenContainers team reserves the right to deny participation any individual found to be engaging in discriminatory or harassing actions.
-
-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.
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project.
-
-## Thanks 
-
-Thanks to the [Fedora Code of Conduct](https://getfedora.org/code-of-conduct) and [Contributor Covenant](http://contributor-covenant.org) for inspiration and ideas.
-
-Portions of this Code of Conduct are adapted from the Contributor Covenant, version 1.2.0, available at http://contributor-covenant.org/version/1/2/0/