diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..fb53340
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,25 @@
+# FROM debian:jessie
+FROM ubuntu:xenial
+MAINTAINER Andrey Arapov <andrey.arapov@nixaid.com>
+
+# To avoid problems with Dialog and curses wizards
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN echo 'deb http://downloads.hipchat.com/linux/apt stable main' > /etc/apt/sources.list.d/atlassian-hipchat.list \
+    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0xAAD4AA21729B5780 \
+    && apt-get update \
+    && apt-get install -yq hipchat libcanberra0 libltdl7 libqt5core5a \
+        libqt5dbus5 libqt5gui5 libqt5network5 libqt5opengl5 libqt5qml5 \
+        libqt5quick5 libqt5widgets5 libqt5xml5 libxcomposite1 \
+    && rm -rf -- /var/lib/apt/lists/*
+
+ENV USER user
+ENV UID 1000
+ENV GROUPS video
+ENV HOME /home/$USER
+RUN useradd -u $UID -m -d $HOME -s /usr/sbin/nologin -g $GROUPS $USER
+
+WORKDIR $HOME
+USER user
+VOLUME [ "/tmp" ]
+ENTRYPOINT [ "/usr/bin/hipchat" ]
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2d56a79
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+# Running HipChat in Docker
+
+* 1. [Install Docker](https://docs.docker.com/engine/installation/)
+* 2. Install [docker-compose](https://docs.docker.com/compose/install/)
+```
+# curl -L https://github.com/docker/compose/releases/download/1.7.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+# chmod +x /usr/local/bin/docker-compose
+```
+
+
+* 3. Run the [hipchat](https://hub.docker.com/r/andrey01/hipchat/)
+```
+git clone https://github.com/arno01/hipchat.git
+cd hipchat
+docker-compose run -d
+```
+
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..67283d3
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '2'
+
+services:
+  hipchat:
+    image: andrey01/hipchat
+    network_mode: bridge
+    devices:
+      - /dev/dri
+    volumes:
+      - /tmp/.X11-unix:/tmp/.X11-unix
+      # - $HOME/.config/Atlassian:/home/user/.config/Atlassian
+      - ./HipChat.ini:/home/user/.config/Atlassian/HipChat.ini
+    environment:
+      - DISPLAY=unix$DISPLAY
+      - TZ=Europe/Amsterdam
+      # - QT_AUTO_SCREEN_SCALE_FACTOR=1
+      # - QT_DEVICE_PIXEL_RATIO=2
+    read_only: true