diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c540f02035..d45e8ac2852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
 * **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
 * **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
 * **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
-* **Orgs**: Sharing dashboards using Grafana share feature will not redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
+* **Orgs**: Sharing dashboards using Grafana share feature will now redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
 * **Pushover**: Add Pushover alert notifications [#7526](https://github.com/grafana/grafana/pull/7526) thx [@devkid](https://github.com/devkid)
 * **Threema**: Add Threema Gateway alert notification integration [#7482](https://github.com/grafana/grafana/pull/7482) thx [@dbrgn](https://github.com/dbrgn)
 
diff --git a/docs/sources/guides/whats-new-in-v4-1.md b/docs/sources/guides/whats-new-in-v4-1.md
index 59e6236af40..bd2b0f1b75f 100644
--- a/docs/sources/guides/whats-new-in-v4-1.md
+++ b/docs/sources/guides/whats-new-in-v4-1.md
@@ -7,7 +7,7 @@ type = "docs"
 name = "Version 4.1"
 identifier = "v4.1"
 parent = "whatsnew"
-weight = -1
+weight = 3
 +++
 
 
diff --git a/docs/sources/guides/whats-new-in-v4-2.md b/docs/sources/guides/whats-new-in-v4-2.md
new file mode 100644
index 00000000000..44aa3a45dc0
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v4-2.md
@@ -0,0 +1,88 @@
++++
+title = "What's New in Grafana v4.2"
+description = "Feature & improvement highlights for Grafana v4.2"
+keywords = ["grafana", "new", "documentation", "4.2.0"]
+type = "docs"
+[menu.docs]
+name = "Version 4.2"
+identifier = "v4.2"
+parent = "whatsnew"
+weight = -1
++++
+
+## Whats new in Grafana v4.2
+
+Grafana v4.2 Beta is now [available for download](/download/4_2_0/).
+Just like the last release this one contains lots bug fixes and minor improvements.
+We are very happy to say that 27 of 40 issues was closed by pull requests from the community.
+Big thumbs up!
+
+## Release Highlights
+
+- **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
+- **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
+- **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [@huydx](https://github.com/huydx)
+- **Templating**: Make $__interval and $__interval_ms global built in variables that can be used in by any datasource (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
+- **Alerting**: Adds deduping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
+- **Alerting**: Better information about why an alert triggered [#7035](https://github.com/grafana/grafana/issues/7035)
+- **Orgs**: Sharing dashboards using Grafana share feature will now redirect to correct org. [#6948](https://github.com/grafana/grafana/issues/6948)
+- [Full changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+
+### New alert notification channels
+
+This release adds **five** new alert notifications channels, all of them contributed by the community.
+
+* Hipchat
+* Telegram
+* LINE
+* Pushover
+* Threema
+
+### Templating
+
+We added two new global built in variables in grafana. `$__interval` and `$__interval_ms` are now reserved template names in grafana and can be used by any datasource.
+We might add more global built in variables in the future and if we do we will prefix them with `$__`. So please avoid using that in your template variables.
+
+### Dedupe alert notifications when running multiple servers
+
+In this release we will dedupe alert notificiations when you are running multiple servers.
+This makes it possible to run alerting on multiple servers and only get one notification.
+
+We currently solve this with sql transactions which puts some limitations for how many servers you can use to execute the same rules.
+3-5 servers should not be a problem but as always, it depends on how many alerts you have and how frequently they execute.
+
+Next up for a better HA situation is to add support for workload balancing between Grafana servers.
+
+### Alerting more info
+
+You can now see the reason why an alert triggered in the alert history. Its also easier to detect when an alert is set to `alerting` due to the `no_data` option.
+
+### Improved support for multi-org setup
+
+When loading dashboards we now set an query parameter called orgId. So we can detect from which org an user shared a dashboard.
+This makes it possible for users to share dashboards between orgs without changing org first.
+
+We aim to introduce [dashboard groups](https://github.com/grafana/grafana/issues/1611) sometime in the future which will introduce access control and user groups within one org.
+Making it possible to have users in multiple groups and have detailed access control.
+
+## Upgrade & Breaking changes
+
+If your using https in grafana we now force you to use tls 1.2 and the most secure ciphers.
+We think its better to be secure by default rather then making it configurable.
+If you want to run https with lower versions of tls we suggest you put a reserve proxy in front of grafana.
+
+If you have template variables name `$__interval` or `$__interval_ms` they will no longer work since these keywords
+are reserved as global built in variables. We might add more global built in variables in the future and if we do, we will prefix them with `$__`. So please avoid using that in your template variables.
+
+## Changelog
+
+Checkout the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list
+of new features, changes, and bug fixes.
+
+## Download
+
+Head to [v4.2-beta download page](/download/4_2_0/) for download links & instructions.
+
+## Thanks
+
+A big thanks to all the Grafana users who contribute by submitting PRs, bug reports & feedback!
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
index fb5c649ad1d..607d683bbb2 100644
--- a/docs/sources/installation/debian.md
+++ b/docs/sources/installation/debian.md
@@ -16,6 +16,7 @@ weight = 1
 Description | Download
 ------------ | -------------
 Stable for Debian-based Linux | [4.1.2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.2-1486989747_amd64.deb)
+Beta for Debian-based Linux | [4.2.0-beta1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.2.0-beta1_amd64.deb)
 
 ## Install Stable
 
@@ -25,6 +26,14 @@ $ sudo apt-get install -y adduser libfontconfig
 $ sudo dpkg -i grafana_4.1.2-1486989747_amd64.deb
 ```
 
+## Install Beta
+
+```
+$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.2.0-beta1_amd64.deb
+$ sudo apt-get install -y adduser libfontconfig
+$ sudo dpkg -i grafana_4.2.0-beta1_amd64.deb
+```
+
 ## APT Repository
 
 Add the following line to your `/etc/apt/sources.list` file.
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
index 56125a4951a..d329b7032c4 100644
--- a/docs/sources/installation/rpm.md
+++ b/docs/sources/installation/rpm.md
@@ -16,6 +16,7 @@ weight = 2
 Description | Download
 ------------ | -------------
 Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2-1486989747.x86_64.rpm)
+Beta for CentOS / Fedora / OpenSuse / Redhat Linux | [4.2.0-beta1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.2.0-beta1.x86_64.rpm)
 
 ## Install Stable
 
diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
index 73816d98a40..b495ad81e98 100644
--- a/docs/sources/installation/windows.md
+++ b/docs/sources/installation/windows.md
@@ -14,6 +14,7 @@ weight = 3
 Description | Download
 ------------ | -------------
 Latest stable package for Windows | [grafana.4.1.2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.2.windows-x64.zip)
+Latest beta package for Windows | [grafana-4.2.0-beta1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.2.0-beta1.windows-x64.zip)
 
 ## Configure