diff --git a/Dockerfile b/Dockerfile
index 6e2a80e..b9f03a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,44 +2,31 @@ FROM ubuntu:latest
 LABEL version="0.4" description="Mosquitto and OwnTracks Recorder"
 MAINTAINER Jan-Piet Mens <jpmens@gmail.com>
 
+RUN apt-get install -y wget && \
+	wget -q -O /tmp/owntracks.gpg.key http://repo.owntracks.org/repo.owntracks.org.gpg.key && \
+	apt-key add /tmp/owntracks.gpg.key
 RUN apt-get install -y software-properties-common && \
 	apt-add-repository ppa:mosquitto-dev/mosquitto-ppa && \
+	apt-add-repository 'deb http://repo.owntracks.org/debian jessie main' && \
 	apt-get update && \
 	apt-get install -y \
-		build-essential \
-		git-core \
-		libmosquitto-dev \
+		libmosquitto1 \
 		libcurl3 \
-		libcurl4-openssl-dev \
-		liblua5.2-dev \
+		liblua5.2-0 \
 		mosquitto \
 		mosquitto-clients \
 		supervisor \
-		wget \
+		ot-recorder \
 		&& \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/*
 
-RUN groupadd --system owntracks && \
-	adduser --system --disabled-password --disabled-login owntracks
-
 # data volume
-RUN mkdir -p -m 775 /owntracks && \
-	chown owntracks:owntracks /owntracks
 VOLUME /owntracks
-
-# Recorder
-RUN mkdir -p /usr/local/src /var/log/supervisor
-WORKDIR /usr/local/src
-RUN git clone https://github.com/owntracks/recorder.git
-WORKDIR /usr/local/src/recorder
-COPY config.mk /usr/local/src/recorder/config.mk
-RUN make && make install
-RUN chown owntracks /usr/local/bin/ocat /usr/local/sbin/ot-recorder && \
-    chgrp owntracks /usr/local/bin/ocat /usr/local/sbin/ot-recorder && \
-    chmod 7111 /usr/local/bin/ocat /usr/local/sbin/ot-recorder
-
-
+COPY ot-recorder.default /etc/default/ot-recorder
+RUN mkdir -p /var/log/supervisor && \
+	mkdir -p -m 775 /owntracks/recorder/store && \
+	chown -R owntracks:owntracks /owntracks
 COPY launcher.sh /usr/local/sbin/launcher.sh
 COPY generate-CA.sh /usr/local/sbin/generate-CA.sh
 RUN chmod 755 /usr/local/sbin/launcher.sh /usr/local/sbin/generate-CA.sh
diff --git a/README.md b/README.md
index 2b5fb8b..0bf271c 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@ This is a Dockerfile for the [OwnTracks Recorder](https://github.com/owntracks/r
 
 It sets Mosquitto broker (with TLS) as well as the OwnTracks Recorder for collecting [OwnTracks](http://owntracks.org) location data.
 
-Images are built automatically when we push to the `recorder` repository, and they are available at [https://hub.docker.com/r/owntracks/recorderd/](https://hub.docker.com/r/owntracks/recorderd/).
+Docker images are built automatically when we push Debian packages to the `recorder` repository, and these Docker images are available at [https://hub.docker.com/r/owntracks/recorderd/](https://hub.docker.com/r/owntracks/recorderd/).
diff --git a/mosquitto.acl b/mosquitto.acl
index 5c3f3ca..e62750c 100644
--- a/mosquitto.acl
+++ b/mosquitto.acl
@@ -5,5 +5,8 @@ topic read $SYS/#
 user roger
 topic foo/bar
 
+user jane
+topic owntracks/jjolie/phone
+
 # This affects all clients.
 pattern write $SYS/broker/connection/%c/state
diff --git a/ot-recorder.default b/ot-recorder.default
new file mode 100644
index 0000000..6452a66
--- /dev/null
+++ b/ot-recorder.default
@@ -0,0 +1,6 @@
+#(@)ot-recorder.default
+#
+# Specify global configuration options for the OwnTracks Recorder
+# and its associated utilities to override compiled-in defaults.
+
+OTR_STORAGEDIR = "/owntracks/recorder/store"