diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..e1ba3f5f
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,31 @@
+from ubuntu:latest
+
+WORKDIR /app
+
+RUN apt-get update; apt-get install -y \
+  build-essential \
+  cmake \
+  git-core \
+  libboost-all-dev \
+  libglew-dev \
+  liblua5.1-0-dev \
+  libopenal-dev \
+  libphysfs-dev \
+  libssl-dev \
+  libvorbis-dev \
+  zlib1g-dev
+
+RUN apt-get install -y \
+  libncurses5-dev \
+  mercurial; \
+  hg clone -r stable-2.0 http://hg.icculus.org/icculus/physfs/; \
+    cd physfs; \
+    mkdir build && cd build && cmake .. && make && make install; \
+    mv /usr/local/lib/libphysfs.a /usr/lib/x86_64-linux-gnu/.
+
+ADD . /app
+
+# Build application
+RUN mkdir -p build && cd build && cmake .. && make -j$(grep -c ^process /proc/cpuinfo); 
+
+CMD cd build; ./otclient 
diff --git a/README.md b/README.md
index 12b5edab..afa529ef 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,15 @@ In short, if you need to compile OTClient, follow these tutorials:
 * [Compiling on Linux](https://github.com/edubart/otclient/wiki/Compiling-on-Linux)
 * [Compiling on OS X](https://github.com/edubart/otclient/wiki/Compiling-on-Mac-OS-X)
 
+### Build and run with Docker
+
+To build and run the client without copile by hand:
+```
+./build.sh
+./run.sh
+```
+
+The build step should be run just when something on implementation changes.
 
 ### Need help?
 
diff --git a/build.sh b/build.sh
new file mode 100755
index 00000000..35ce50fd
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+docker build -t edubart/otclient .
diff --git a/run.sh b/run.sh
new file mode 100755
index 00000000..288c22bd
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+SE_enforcing=`getenforce` || true
+
+sudo setenforce Permissive || true
+
+# Enable any host to connect on X Org
+xhost +
+
+docker run -ti --rm \
+       -e DISPLAY \
+       -v /tmp/.X11-unix:/tmp/.X11-unix \
+       --device /dev/dri \
+       edubart/otclient 
+
+# Enable any host to connect on X Org
+xhost -
+
+sudo setenforce $SE_enforcing || true