2 files changed, 35 insertions, 6 deletions

diff --git a/README.md b/README.md
index 68b5dc519..fadf3f801 100644
--- a/README.md
+++ b/README.md
@@ -129,13 +129,22 @@ See [wiki](https://github.com/Chocobozzz/PeerTube/wiki) for complete installatio
 
 #### Debian
 
-  * Install NodeJS 6.x (actual LTS): [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions)
-  * Install yarn: [https://yarnpkg.com/en/docs/install](https://yarnpkg.com/en/docs/install)
-  * Add jessie backports to your *source.list*: http://backports.debian.org/Instructions/
-  * Run:
+  1. Install NodeJS 6.x (previous LTS): [https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions)
+  2. Install yarn: [https://yarnpkg.com/en/docs/install](https://yarnpkg.com/en/docs/install)
+  3. Add jessie backports to your *source.list*: http://backports.debian.org/Instructions/
+  4. Run:
 
-        # apt-get update
-        # apt-get install ffmpeg postgresql-9.4 openssl
+        $ apt-get update
+        $ apt-get install ffmpeg postgresql-9.4 openssl
+
+#### Ubuntu 16.04
+
+  1. Install NodeJS 8.x (current LTS): (same as Debian)
+  2. Install yarn: (same as Debian)
+  3. Run:
+
+        $ apt-get update
+        $ apt-get install ffmpeg postgresql openssl
 
 #### Other distribution... (PR welcome)
 
diff --git a/support/docker/dev/Dockerfile b/support/docker/dev/Dockerfile
new file mode 100644
index 000000000..2328140fb
--- /dev/null
+++ b/support/docker/dev/Dockerfile
@@ -0,0 +1,20 @@
+FROM janx/ubuntu-dev
+MAINTAINER Jan Keromnes <janx@linux.com>
+
+# Install PeerTube's dependencies.
+# Packages are from https://github.com/Chocobozzz/PeerTube#dependencies
+RUN sudo apt-get update -q && sudo apt-get install -qy \
+ ffmpeg \
+ postgresql \
+ openssl
+
+# Download PeerTube's source code.
+RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube
+WORKDIR /home/user/PeerTube
+
+# Configure Cloud9 IDE to use PeerTube's source directory as workspace (-w).
+RUN sudo sed -i "s/-w \/home\/user/-w \/home\/user\/PeerTube/" /etc/supervisord.conf
+
+# Configure and build PeerTube.
+RUN yarn install \
+ && npm run build