diff --git a/_data/docsarchive/archives.yaml b/_data/docsarchive/archives.yaml
index 8943f017fa..4f38399fdd 100644
--- a/_data/docsarchive/archives.yaml
+++ b/_data/docsarchive/archives.yaml
@@ -2,6 +2,11 @@
   name: v17.09
   image: docs/docker.github.io:latest
   current: true
+# When you make a new stable archive version, move the edge one to be second in
+# the list. The image for edge should be the same as latest.
+- archive:
+  name: Edge
+  image: docs/docker.github.io:latest
 - archive:
   name: v17.06
   image: docs/docker.github.io:v17.06
diff --git a/docsarchive.md b/docsarchive.md
index 0bee4b06a5..19cb40d02c 100644
--- a/docsarchive.md
+++ b/docsarchive.md
@@ -17,8 +17,11 @@ run:
 ```
 docker run -ti -p 4000:4000 {{ archive.image }}
 ```
+
 {% else %}
 
+{% if archive.name != 'edge' %}
+
 ## {{ archive.name }}
 
 Docs for {{ archive.name }} are accessible at [**https://docs.docker.com/{{ archive.name }}/**](/{{ archive.name }}/), or
@@ -27,5 +30,7 @@ run:
 ```
 docker run -ti -p 4000:4000 {{ archive.image }}
 ```
+
+{% endif %} <!-- edge check -->
 {% endif %}
 {% endfor %}