diff --git a/Dockerfile b/Dockerfile
index 966c5d7..f3f6616 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,27 +1,28 @@
-FROM ubuntu:15.10
+FROM ubuntu:14.04
 MAINTAINER Joey Baker <joey@byjoeybaker.com>
 
-ENV SYNCTHING_VERSION 0.12.11
-
 RUN apt-get update \
   && apt-get upgrade -y --no-install-recommends \
   && apt-get install curl ca-certificates -y --no-install-recommends \
   && apt-get autoremove -y \
   && apt-get clean
 
+ENV SYNCTHING_VERSION 0.12.11
+ENV SYNCTHING_USER syncthing
+ENV UID 1027
+
 # grab gosu for easy step-down from root
 RUN gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
-  && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \
-  && curl -o /usr/local/bin/gosu.asc -L "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \
+  && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture)" \
+  && curl -o /usr/local/bin/gosu.asc -L "https://github.com/tianon/gosu/releases/download/1.7/gosu-$(dpkg --print-architecture).asc" \
   && gpg --verify /usr/local/bin/gosu.asc \
   && rm /usr/local/bin/gosu.asc \
   && chmod +x /usr/local/bin/gosu
 
 # get syncthing
 WORKDIR /srv
-RUN useradd --no-create-home -g users syncthing
-RUN export version=0.12.9 \ 
-  && curl -L -o syncthing.tar.gz https://github.com/syncthing/syncthing/releases/download/v$SYNCTHING_VERSION/syncthing-linux-amd64-v$SYNCTHING_VERSION.tar.gz \
+RUN useradd --no-create-home -g users --uid $UID $SYNCTHING_USER
+RUN curl -L -o syncthing.tar.gz https://github.com/syncthing/syncthing/releases/download/v$SYNCTHING_VERSION/syncthing-linux-amd64-v$SYNCTHING_VERSION.tar.gz \
   && tar -xzvf syncthing.tar.gz \
   && rm -f syncthing.tar.gz \
   && mv syncthing-linux-amd64-v* syncthing \
@@ -32,10 +33,8 @@ RUN export version=0.12.9 \
 
 VOLUME ["/srv/data", "/srv/config"]
 
-ADD ./start.sh /srv/start.sh
+ADD ./files/start.sh /srv/start.sh
 RUN chmod 770 /srv/start.sh
 
-ENV UID=1027
-
 ENTRYPOINT ["/srv/start.sh"]
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..d72d1a5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,13 @@
+all: build
+
+build:
+	@docker build --tag=joeybaker/syncthing:latest .
+
+base:
+	@docker pull ubuntu:14.04
+
+rebuild: base
+	@docker build --tag=joeybaker/syncthing:latest .
+
+release: rebuild
+	@docker build --tag=joeybaker/syncthing:0.12.11 .
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..eeb344a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,14 @@
+# https://docs.docker.com/compose/yml/
+
+syncthing:
+  container_name: syncthing
+  hostname: syncthing
+  image: joeybaker/syncthing
+  ports:
+    - "22000:22000"
+    - "8080:8080"
+    - "21025:21025/udp"
+  volumes:
+    - /srv/docker/syncthing/data:/srv/data
+    - /srv/docker/syncthing/config:/srv/config
+  restart: always
diff --git a/start.sh b/files/start.sh
similarity index 100%
rename from start.sh
rename to files/start.sh