diff --git a/endpoints/web.py b/endpoints/web.py
index 625c6d58d..3c6c5e07b 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -115,6 +115,11 @@ def tos():
   return render_template('tos.html')
 
 
+@app.route('/disclaimer', methods=['GET'])
+def disclaimer():
+  return render_template('disclaimer.html')
+
+
 @app.route('/privacy', methods=['GET'])
 def privacy():
   return render_template('privacy.html')
diff --git a/static/css/quay.css b/static/css/quay.css
index 306322197..15ae81f66 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -522,6 +522,15 @@ html, body {
   padding: 20px;
 }
 
+.jumbotron .disclaimer-link {
+  font-size: .5em;
+  vertical-align: top;
+}
+
+.jumbotron .disclaimer-link:hover {
+  text-decoration: none;
+}
+
 .landing .popover {
   font-size: 14px;
 }
diff --git a/static/partials/landing.html b/static/partials/landing.html
index fbde7f520..e5165fc88 100644
--- a/static/partials/landing.html
+++ b/static/partials/landing.html
@@ -3,9 +3,9 @@
     <div class="row messages">
       <div class="col-md-7">
         <div ng-show="user.anonymous">
-          <h1>Secure hosting for <b>private</b> docker repositories</h1>
-          <h3>Use the docker images <b>your team</b> needs with the safety of <b>private</b> repositories</h3>
-          <div class="sellcall"><a href="/plans">Private repository plans starting at $7/mo</a></div>
+          <h1>Secure hosting for <b>private</b> Docker<a class="disclaimer-link" href="/disclaimer" target="_self">*</a> repositories</h1>
+          <h3>Use the Docker images <b>your team</b> needs with the safety of <b>private</b> repositories</h3>
+          <div class="sellcall"><a href="/plans/">Private repository plans starting at $7/mo</a></div>
         </div>
 
         <div ng-show="!user.anonymous">
@@ -72,9 +72,9 @@
         <i class="fa fa-lock"></i>
         <b>Secure</b>
         <span class="shoutout-expand">
-	  Store your private docker containers where only you and your team
+          Store your private Docker containers where only you and your team
           can access it, with communication secured by <strong>SSL at all times</strong>
-	</span>
+        </span>
       </div>
 
       <div class="col-md-4 shoutout">
diff --git a/templates/disclaimer.html b/templates/disclaimer.html
new file mode 100644
index 000000000..3945b43a6
--- /dev/null
+++ b/templates/disclaimer.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% block title %}
+  <title>Docker Trademark Disclaimer · Quay.io</title>
+{% endblock %}
+
+{% block body_content %}
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
+        Quay.io is in no way (and we mean in no way) affiliated with or sponsored by Docker, Inc. Docker, Docker logo and dotCloud are trademarks or registered trademarks of Docker, Inc. in the United States and/or other countries. Docker, Inc. and other parties may also have trademark rights in other terms used herein.
+      </div>
+    </div>
+
+  </div>
+{% endblock %}
\ No newline at end of file