diff --git a/docs/Dockerfile b/docs/Dockerfile
index b3af539dc06..69f47e82d08 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -15,9 +15,9 @@ COPY ./VERSION VERSION
 #COPY ./image/spec/v1.md /docs/sources/reference/image-spec-v1.md
 
 # TODO: don't do this - look at merging the yml file in build.sh
-COPY ./mkdocs.yml mkdocs.yml
+COPY ./mkdocs.yml /docs/mkdocs.yml
 
-COPY ./s3_website.json s3_website.json
+COPY ./s3_website.json /docs/s3_website.json
 
 # Then build everything together, ready for mkdocs
 RUN /docs/build.sh
diff --git a/docs/Makefile b/docs/Makefile
index f2e2750d6d5..5a111e2eff4 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -36,7 +36,9 @@ docs-shell: docs-build
 	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
 
 docs-release: docs-build
-	$(DOCKER_RUN_DOCS) -e OPTIONS -e BUILD_ROOT -e DISTRIBUTION_ID "$(DOCKER_DOCS_IMAGE)" ./release.sh
+	$(DOCKER_RUN_DOCS) -e OPTIONS -e BUILD_ROOT -e DISTRIBUTION_ID \
+		-v $(CURDIR)/awsconfig:/docs/awsconfig \
+		"$(DOCKER_DOCS_IMAGE)" ./release.sh
 
 docs-test: docs-build
 	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
diff --git a/docs/s3_website.json b/docs/s3_website.json
index 03245d04e07..b0747526d75 100644
--- a/docs/s3_website.json
+++ b/docs/s3_website.json
@@ -6,8 +6,6 @@
     "Suffix": "index.html"
   },
   "RoutingRules": [
-    { "Condition": { "KeyPrefixEquals": "en/latest/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } },
-    { "Condition": { "KeyPrefixEquals": "en/master/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } },
     { "Condition": { "KeyPrefixEquals": "jsearch/index.html" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "jsearch/" } }
   ]
 }
diff --git a/docs/sources/index.md b/docs/sources/index.md
index 48e51c52156..e0411164e3e 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -4,15 +4,14 @@ page_keywords: grafana, introduction, documentation, about
 
 # About
 
-Grafana is a frontend for [Graphite](http://graphite.readthedocs.org/en/latest/), [InfluxDB](http://influxdb.org)
-and [OpenTSDB](http://opentsdb.net) with powerfull visualization features for time series data.
-You will need either a Graphite, InfluxDB or OpenTSDB server for Grafana to be of any use.
-
-## Why Grafana?
-because its the best.
-
-## Release notes
+Grafana is a general purpose dashboard and graph composer. Its focused on providing
+rich ways to visualize time series metrics, mainly though graphs. It currently
+has rich support for for [Graphite](http://graphite.readthedocs.org/en/latest/), [InfluxDB](http://influxdb.org)
+and [OpenTSDB](http://opentsdb.net). But supports other data sources via plugins.
 
 ## License
 
+Grafana is licensed under Apache 2.0. See [LICENSE](https://github.com/grafana/grafana/blob/master/LICENSE.mdhttps://github.com/grafana/grafana/blob/master/LICENSE.md)
+for full license text.
+