diff --git a/motion-arm/Dockerfile b/motion-arm/Dockerfile
new file mode 100644
index 0000000..c8fecd3
--- /dev/null
+++ b/motion-arm/Dockerfile
@@ -0,0 +1,21 @@
+#
+# Dockerfile for motion-arm
+#
+
+FROM resin/rpi-raspbian
+MAINTAINER kev <noreply@datageek.info>
+
+RUN set -xe \
+    && apt-get update \
+    && apt-get install -y motion \
+    && sed -i -e 's/^daemon on/daemon off/' \
+              -e 's/^webcontrol_localhost on/webcontrol_localhost off/' \
+              -e 's/^stream_localhost on/stream_localhost off/' \
+              /etc/motion/motion.conf \
+    && rm -rf /var/cache/apt/*
+
+VOLUME /var/lib/motion
+
+EXPOSE 8080 8081
+
+CMD ["/usr/bin/motion"]
diff --git a/motion-arm/README.md b/motion-arm/README.md
new file mode 100644
index 0000000..3cf792d
--- /dev/null
+++ b/motion-arm/README.md
@@ -0,0 +1,10 @@
+motion-arm
+==========
+
+![](https://badge.imagelayers.io/vimagick/motion-arm:latest.svg)
+
+[Motion][1] is a program that monitors the video signal from one or more cameras
+and is able to detect if a significant part of the picture has changed. Or in
+other words, it can detect motion.
+
+[1]: http://lavrsen.dk/foswiki/bin/view/Motion/WebHome
diff --git a/motion-arm/docker-compose.yml b/motion-arm/docker-compose.yml
new file mode 100644
index 0000000..eaaaf38
--- /dev/null
+++ b/motion-arm/docker-compose.yml
@@ -0,0 +1,10 @@
+motion:
+  image: vimagick/motion-arm
+  ports:
+    - "8080:8080"
+    - "8081:8081"
+  volumes:
+    - ./motion:/var/lib/motion
+  devices:
+    - /dev/video0:/dev/video0
+  restart: always