diff --git a/privoxy/Dockerfile b/privoxy/Dockerfile
index a219fca..3a377d2 100644
--- a/privoxy/Dockerfile
+++ b/privoxy/Dockerfile
@@ -1,13 +1,12 @@
 # run a privoxy in a container and link to a tor socks proxy container
 #
-# Exit relay:
-# 	docker run -d \
-#		--restart always \
-#		--link torproxy:torproxy \
-#		-v /etc/localtime:/etc/localtime:ro \
-#		-p 8118:8118 \
-# 		--name privoxy \
-# 		jess/privoxy
+# docker run -d \
+#	--restart always \
+#	--link torproxy:torproxy \
+#	-v /etc/localtime:/etc/localtime:ro \
+#	-p 8118:8118 \
+# 	--name privoxy \
+# 	jess/privoxy
 #
 FROM alpine:latest
 MAINTAINER Jessica Frazelle <jess@docker.com>
diff --git a/ricochet/Dockerfile b/ricochet/Dockerfile
new file mode 100644
index 0000000..3933067
--- /dev/null
+++ b/ricochet/Dockerfile
@@ -0,0 +1,48 @@
+# Run ricochet in a container
+# see: https://ricochet.im/
+#
+# docker run -d \
+#	--restart always \
+#	-v /etc/localtime:/etc/localtime:ro \
+#	-v /tmp/.X11-unix:/tmp/.X11-unix \
+#	-e DISPLAY=unix$DISPLAY \
+# 	--name ricochet \
+# 	jess/ricochet
+#
+FROM debian:sid
+MAINTAINER Jessica Frazelle <jess@docker.com>
+
+RUN apt-get update && apt-get install -y \
+	libasound2 \
+	libfontconfig1 \
+	libgl1-mesa-dri \
+	libgl1-mesa-glx \
+	libx11-xcb1 \
+	libxext6 \
+	libxrender1 \
+	qtbase5-dev \
+	&& rm -rf /var/lib/apt/lists/*
+
+ENV RICOCHET_VERSION 1.1.1
+ENV RICOCHET_FINGERPRINT 0xFF97C53F183C045D
+
+RUN buildDeps=' \
+		bzip2 \
+		ca-certificates \
+		curl \
+	' \
+	&& set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& curl -sSL https://ricochet.im/releases/latest/ricochet-${RICOCHET_VERSION}-static-x86_64.tar.bz2 -o /tmp/ricochet.tar.bz2 \
+	&& curl -sSL https://ricochet.im/releases/latest/ricochet-${RICOCHET_VERSION}-static-x86_64.tar.bz2.asc -o /tmp/ricochet.tar.bz2.asc \
+	&& mkdir ~/.gnupg \
+	&& gpg --keyserver pgp.mit.edu --recv-keys ${RICOCHET_FINGERPRINT} \
+	&& gpg --fingerprint ${RICOCHET_FINGERPRINT} | grep "Key fingerprint = 9032 CAE4 CBFA 933A 5A21  45D5 FF97 C53F 183C 045D" \
+	&& gpg /tmp/ricochet.tar.bz2.asc \
+	&& tar -vxj --strip-components 1 -C /usr/local/bin -f /tmp/ricochet.tar.bz2 \
+	&& rm -rf /tmp/ricochet* \
+	&& rm -rf ~/.gnupg \
+	&& apt-get purge -y --auto-remove $buildDeps
+
+ENTRYPOINT [ "ricochet" ]
diff --git a/tor-proxy/Dockerfile b/tor-proxy/Dockerfile
index 41e885f..99892f4 100644
--- a/tor-proxy/Dockerfile
+++ b/tor-proxy/Dockerfile
@@ -1,12 +1,11 @@
 # run a tor socks proxy in a container
 #
-# Exit relay:
-# 	docker run -d \
-#		--restart always \
-#		-v /etc/localtime:/etc/localtime:ro \
-#		-p 9050:9050 \
-# 		--name torproxy \
-# 		jess/tor-proxy
+# docker run -d \
+#	--restart always \
+#	-v /etc/localtime:/etc/localtime:ro \
+#	-p 9050:9050 \
+# 	--name torproxy \
+# 	jess/tor-proxy
 #
 FROM alpine:latest
 MAINTAINER Jessica Frazelle <jess@docker.com>