diff --git a/tor/Dockerfile b/tor/Dockerfile
index 6dad98a..5bd05ed 100644
--- a/tor/Dockerfile
+++ b/tor/Dockerfile
@@ -2,44 +2,30 @@
 # Dockerfile for tor
 #
 
-FROM alpine
+FROM alpine:edge
 MAINTAINER kev <noreply@datageek.info>
 
-ENV TOR_VER 0.2.6.9
-ENV TOR_URL https://www.torproject.org/dist/tor-$TOR_VER.tar.gz
-ENV TOR_MD5 4a1b334c30d7b37ea72fa33425220d5d
-ENV TOR_FILE tor.tar.gz
-ENV TOR_TEMP tor-$TOR_VER
-
-RUN apk add -U build-base \
-               gmp-dev \
-               libevent \
-               libevent-dev \
-               libgmpxx \
-               openssl \
-               openssl-dev \
-               python \
-               python-dev \
-    && wget -O $TOR_FILE $TOR_URL \
-        && echo "$TOR_MD5  $TOR_FILE" | md5sum -c \
-        && tar xzf $TOR_FILE \
-        && cd $TOR_TEMP \
-        && ./configure --prefix=/ --exec-prefix=/usr \
-        && make install \
-        && cd .. \
-        && rm -rf $TOR_FILE $TOR_TEMP \
-    && wget -O- https://bootstrap.pypa.io/get-pip.py | python \
-        && pip install fteproxy \
-                       obfsproxy \
+RUN echo 'http://dl-4.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
+    && apk add -U build-base \
+                  gmp-dev \
+                  libgmpxx \
+                  py-pip \
+                  python \
+                  python-dev \
+                  tor \
+    && pip install fteproxy \
+                   obfsproxy \
     && apk del build-base \
                gmp-dev \
-               libevent-dev \
-               openssl-dev \
                python-dev \
     && rm -rf /var/cache/apk/*
 
 COPY ./torrc /etc/tor/torrc
-VOLUME /etc/tor /root/.tor
+
+USER tor
+WORKDIR /home/tor
+
+VOLUME /etc/tor /home/tor/.tor
 EXPOSE 9001 9030 9050 9051
 
 CMD ["/usr/bin/tor", "-f", "/etc/tor/torrc"]
diff --git a/tor/README.md b/tor/README.md
index 0f2b3c9..4992d1c 100644
--- a/tor/README.md
+++ b/tor/README.md
@@ -1,6 +1,8 @@
 tor
 ===
 
+![](https://badge.imagelayers.io/vimagick/tor:latest.svg)
+
 [`Tor`][1] is free software and an open network that helps you defend against
 traffic analysis, a form of network surveillance that threatens personal
 freedom and privacy, confidential business activities and relationships, and