diff --git a/docs/Makefile b/docs/Makefile
index e5c555f8019..08b46f2b689 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -11,6 +11,9 @@ DOCS_MOUNT := -v $(SOURCES_HOST_DIR):/site/content
 
 DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e NOCACHE -p 3004:3004 -p 3005:3005
 
+VERSION = "root"
+
+$(info publishing $(VERSION))
 
 default: docs
 
@@ -24,10 +27,10 @@ docs-watch: docs-build
 	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
 
 publish: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs root"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs ${VERSION}"
 
 publish-prod: docs-build
-	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs ${VERSION}"
 
 docs-build:
 	docker build -t "$(DOCKER_DOCS_IMAGE)" --no-cache .
diff --git a/docs/sources/archive.md b/docs/sources/archive.md
index af4ab5e7a8f..fcf81094d8e 100644
--- a/docs/sources/archive.md
+++ b/docs/sources/archive.md
@@ -12,10 +12,6 @@ weight = 200
 Here you can find links to older versions of the documentation that might be better suited for your version
 of Grafana.
 
-- [Latest](/)
-- [Version 3.1](/v3.1)
-- [Version 3.0](/v3.0)
-- [Version 2.6](/v2.6)
-- [Version 2.5](/v2.5)
-- [Version 2.1](/v2.1)
-- [Version 2.0](/v2.0)
+- [Latest](http://docs.grafana.org)
+- [Version 3.1](http://docs.grafana.org/v3.1)
+- [Version 3.0](http://docs.grafana.org/v3.0)