diff --git a/Dockerfile b/Dockerfile
index 8d4b72d..e1f5c9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,12 @@
-FROM debian:jessie
-MAINTAINER David Stefan <stefda@gmail.com>
-
+FROM debian:latest
+MAINTAINER Justin Hammond <justin@dynam.ac>
+LABEL org.opencontainers.image.source = "https://github.com/Fishwaldo/docker-rsync"
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends rsync && \
   apt-get clean autoclean && \
   apt-get autoremove -y && \
-  rm -rf /var/lib/apt/lists/*
+  rm -rf /var/lib/apt/lists/* && \
+  mkdir /etc/rsync/
 
 EXPOSE 873
 ADD ./entrypoint.sh /entrypoint.sh
diff --git a/entrypoint.sh b/entrypoint.sh
index 3f2f542..15a74ed 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,8 +9,9 @@ mkdir -p ${VOLUME}
 getent group ${GROUP} > /dev/null || addgroup ${GROUP}
 getent passwd ${USER} > /dev/null || adduser -D -H -G ${GROUP} ${USER}
 chown -R ${USER}:${GROUP} ${VOLUME}
+mkdir /etc/rsync/
 
-cat <<EOF > /etc/rsyncd.conf
+cat <<EOF > /etc/rsync/rsyncd.conf
 uid = ${USER}
 gid = ${GROUP}
 use chroot = yes
@@ -24,4 +25,4 @@ reverse lookup = no
     comment = docker volume
 EOF
 
-exec /usr/bin/rsync --no-detach --daemon --config /etc/rsyncd.conf
+exec /usr/bin/rsync --no-detach --daemon --config /etc/rsync/rsyncd.conf --verbose