diff --git a/docker/Dockerfile-armv7l b/docker/Dockerfile-armv7l
new file mode 100644
index 0000000..f3290e5
--- /dev/null
+++ b/docker/Dockerfile-armv7l
@@ -0,0 +1,26 @@
+FROM arm32v7/debian:jessie
+
+# Install all sdl, love (build) deps and love-linux-builder deps
+RUN apt-get update && apt-get install -y build-essential cmake libgl1-mesa-glx libgles2-mesa-dev libxrandr-dev libdbus-1-dev libxi-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libibus-1.0-dev libasound2-dev libpulse-dev libwayland-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config
+
+# Now build sdl
+ADD SDL2-2.0.10.tar.gz /tmp/
+RUN cd /tmp/SDL2-2.0.10 && ./configure --prefix=/usr && make all install
+
+# And build luajit
+ADD LuaJIT-2.0.5.tar.gz /tmp/
+RUN cd /tmp/LuaJIT-2.0.5 && make PREFIX=/usr all install
+
+# And build a modern openal soft
+ADD openal-soft-1.19.1.tar.gz /tmp/
+RUN cd /tmp/openal-soft-openal-soft-1.19.1/build && cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make all install
+
+# Add the build script
+ADD build.sh /build/
+
+# Add the volumes, the first the love-linux-builder (mandatory), the second the love source (optional)
+RUN mkdir -p /build/love-linux-builder /build/love
+VOLUME /build/love-linux-builder /build/love
+
+# Finally, set the build script as entrypoint
+ENTRYPOINT ["/usr/bin/setarch", "armv7l", "/build/build.sh"]
diff --git a/docker/Dockerfile-32bit b/docker/Dockerfile-i686
similarity index 100%
rename from docker/Dockerfile-32bit
rename to docker/Dockerfile-i686
diff --git a/docker/Dockerfile b/docker/Dockerfile-x86_64
similarity index 93%
rename from docker/Dockerfile
rename to docker/Dockerfile-x86_64
index d3f363d..8d8af8f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile-x86_64
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM amd64/debian:jessie
 
 # Install all sdl, love (build) deps and love-linux-builder deps
 RUN apt-get update && apt-get install -y build-essential cmake libgl1-mesa-glx libgles2-mesa-dev libxrandr-dev libdbus-1-dev libxi-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libibus-1.0-dev libasound2-dev libpulse-dev libwayland-dev libfreetype6-dev libopenal-dev libmodplug-dev libvorbis-dev libtheora-dev libphysfs-dev libmpg123-dev squashfs-tools curl mercurial libfuse2 autotools-dev automake libtool pkg-config
@@ -23,4 +23,4 @@ RUN mkdir -p /build/love-linux-builder /build/love
 VOLUME /build/love-linux-builder /build/love
 
 # Finally, set the build script as entrypoint
-ENTRYPOINT ["/build/build.sh"]
+ENTRYPOINT ["/usr/bin/setarch", "x86_64", "/build/build.sh"]