diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 6976e46d060..0da02314aae 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -27,6 +27,12 @@ pages:
 # Introduction:
 - ['index.md', 'About', 'Grafana']
 - ['installation/index.md', 'Installation', 'Installation']
+- ['installation/debian.md', 'Installation', 'Installing on Debian / Ubuntu']
+- ['installation/rpm.md', 'Installation', 'Installing on RPM-based Linux']
+- ['installation/windows.md', 'Installation', 'Installing on Windows']
+- ['installation/mac.md', 'Installation', 'Installing on Mac OS X']
+- ['installation/docker.md', 'Installation', 'Installing on Docker']
+
 - ['installation/configuration.md', 'Installation', 'Configuration']
 - ['installation/provisioning.md', 'Installation', 'Provisioning']
 - ['installation/performance.md', 'Installation', 'Performance tips']
diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md
new file mode 100644
index 00000000000..628f72f24a8
--- /dev/null
+++ b/docs/sources/installation/debian.md
@@ -0,0 +1,64 @@
+---
+page_title: Installing on Debian / Ubuntu
+page_description: Grafana Installation guide for Debian / Ubuntu.
+page_keywords: grafana, installation, debian, ubuntu, guide
+---
+
+# Installing on Debian / Ubuntu
+
+## Download
+
+Description | Download
+------------ | -------------
+.deb for Debian-based Linux | [grafana_2.0.0-beta3_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0-beta3_amd64.deb)
+
+## Install
+To install the package
+
+    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0-beta3_amd64.deb
+    $ sudo apt-get install -y adduser libfontconfig
+    $ sudo dpkg -i grafana_latest_amd64.deb
+
+## Package details
+
+- Installs binary to `/usr/sbin/grafana-server`
+- Init.d script to `/etc/init.d/grafana-server`
+- Default file (environment vars) to `/etc/default/grafana-server`
+- Configuration file to `/etc/grafana/grafana.ini`
+- Systemd service (if systemd is available) name `grafana-server.service`
+- The default configuration specifies log file at `/var/log/grafana/grafana.log`
+- The default configuration specifies sqlite3 db at `/var/lib/grafana/grafana.db`
+
+## Start the server (init.d service)
+
+- Start grafana by `sudo service grafana-server start`
+- This will start the grafana-server process as the `grafana` user (created during package install)
+- Default http port is `3000`, and default user is admin/admin
+
+## Start the server (via systemd)
+
+    $ systemctl daemon-reload
+    $ systemctl start grafana-server
+    $ systemctl status grafana-server
+
+## Environment file
+
+The systemd service file and init.d script both use the file located at `/etc/default/grafana-server` for
+environment variables used when starting the backend. Here you can override log directory, data directory and other
+variables.
+
+### Logging
+
+By default grafana will log to /var/log/grafana
+
+## Configuration
+
+The configuration file is located at `/etc/grafana/grafana.ini`.  Go the [Configuration](configuration) page for details
+on all those options.
+
+### Adding data sources
+
+- [Graphite](../datasources/graphite.md)
+- [InfluxDB](../datasources/influxdb.md)
+- [OpenTSDB](../datasources/opentsdb.md)
+
diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md
new file mode 100644
index 00000000000..9773d93e9f5
--- /dev/null
+++ b/docs/sources/installation/docker.md
@@ -0,0 +1,9 @@
+---
+page_title: Installing using Docker
+page_description: Grafana Installation guide using Docker container
+page_keywords: grafana, installation, docker, container, guide
+---
+
+# Installing using Docker
+
+
diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/sources/installation/rpm.md b/docs/sources/installation/rpm.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md
index a74759572cd..c316a22a495 100644
--- a/docs/sources/project/building_from_source.md
+++ b/docs/sources/project/building_from_source.md
@@ -48,7 +48,7 @@ bra run
 
 ## Running
 ```
-./grafana web
+./grafana-server
 ```
 
 Open grafana in your browser (default http://localhost:3000) and login with admin user (default user/pass = admin/admin).
@@ -64,8 +64,7 @@ Create a custom.ini in the conf directory to override default configuration opti
 You only need to add the options you want to override. Config files are applied in the order of:
 
 1. grafana.ini
-2. dev.ini (if found)
-3. custom.ini
+2. custom.ini
 
 ## Create a pull requests
 
diff --git a/latest.json b/latest.json
index caa14a3342e..7f8c221daf3 100644
--- a/latest.json
+++ b/latest.json
@@ -1,3 +1,3 @@
 {
-	"version": "2.0.0-beta1",
+	"version": "2.0.0-beta3",
 }