diff --git a/README.md b/README.md
index 4a61ca1f3..2f5536c86 100644
--- a/README.md
+++ b/README.md
@@ -156,4 +156,40 @@ TODO
 
 ### Terminology
 
-TODO
+#### Organizations
+
+- **AppC**: a standards body responsible for a _Runtime_ and _Image Format_ superseded by the _Open Container Initiative_
+- **Open Container Initiative**: a standards body responsible for a _Runtime_ specification and an _Image Format_
+- **Docker**: a company that builds a platform that has its own _Image Formats_, _Build System_, _Container Runtime_, and _Container Orchestration_
+
+#### Concepts
+
+- **Image**: an archive containing all of the contents necessary to execute a container
+- **Image Format**: a specification for the structure of an _Image_
+- **Image Layer**: an _Image_ that may depend on being applied to other _Images_ to generate a final _Image_
+- **Image Squashing**: the process of compressing an _Image_ into a single _Layer_
+- **Manifest**: a text file containing metadata for a particular _Image_
+- **Tag**: a human-friendly named, mutable pointer to a particular set of _Images_
+- **Build System**: a program used to generate _Images_
+- **Registry**: a program that speaks one or more standard protocols to store and receive _Images_
+- **Repository**: a collection of related _Tags_ organized by a _Registry_
+- **Push**: the act of uploading an _Image_ to a _Registry_
+- **Pull**: the act of downloading an _Image_ from a _Registry_
+- **Container**: an _Image_ and its execution environment
+- **Container Runtime**: a program that can transform an _Image_ into a _Container_ by executing it
+- **Container Orchestration**: a program or set of programs that provides a framework for deploying _Containers_
+
+#### Software
+
+- **Quay.io**: CoreOS's hosted _Registry_
+- **Quay**: CoreOS's enterprise-grade _Registry_ product
+- **quayctl**: an open source program that implements alternative methods for _pulling_ _Images_ from _Quay_
+- **Clair**: an open source static analysis tool used to detect vulnerability in _Images_
+- **Quay Security Scanning**: the integration between _Clair_ and _Quay_
+- **Kubernetes**: an open source program implementing _Container Orchestration_
+- **Docker Hub**: Docker's hosted _Registry_
+- **Docker Trusted Registry**: Docker's enterprise-grade _Registry_ product
+- **Notary**: an open source implementation of the TUF protocol used in _Docker Content Trust_
+- **Docker Content Trust**: the integration between _Notary_ and _Docker Trusted Registry)
+- **Docker Engine**: a program used to interact with all aspects of the Docker platform
+- **Swarm**: a program implementing _Container Orchestration_ for the Docker platform