diff --git a/dnscrypt/Dockerfile b/dnscrypt/proxy/Dockerfile
similarity index 100%
rename from dnscrypt/Dockerfile
rename to dnscrypt/proxy/Dockerfile
diff --git a/dnscrypt/README.md b/dnscrypt/proxy/README.md
similarity index 100%
rename from dnscrypt/README.md
rename to dnscrypt/proxy/README.md
diff --git a/dnscrypt/fig.yml b/dnscrypt/proxy/fig.yml
similarity index 100%
rename from dnscrypt/fig.yml
rename to dnscrypt/proxy/fig.yml
diff --git a/dnscrypt/pdnsd.conf b/dnscrypt/proxy/pdnsd.conf
similarity index 100%
rename from dnscrypt/pdnsd.conf
rename to dnscrypt/proxy/pdnsd.conf
diff --git a/dnscrypt/services.conf b/dnscrypt/proxy/services.conf
similarity index 100%
rename from dnscrypt/services.conf
rename to dnscrypt/proxy/services.conf
diff --git a/dnscrypt/wrapper/Dockerfile b/dnscrypt/wrapper/Dockerfile
new file mode 100644
index 0000000..4934803
--- /dev/null
+++ b/dnscrypt/wrapper/Dockerfile
@@ -0,0 +1,61 @@
+#
+# Dockerfile for dnscrypt-wrapper
+#
+
+FROM debian:jessie
+
+MAINTAINER kev <noreply@datageek.info>
+
+RUN apt-get update \
+    && apt-get install -y build-essential \
+                          curl \
+                          git \
+                          libevent-dev \
+    && mkdir libsodium \
+        && curl -sSL https://download.libsodium.org/libsodium/releases/libsodium-1.0.3.tar.gz | tar xz --strip 1 -C libsodium \
+        && cd libsodium \
+        && ./configure --prefix=/usr \
+        && make install \
+        && ldconfig \
+        && cd .. \
+        && rm -rf libsodium \
+    && git clone --recursive git://github.com/Cofyc/dnscrypt-wrapper.git \
+        && cd dnscrypt-wrapper \
+        && make configure \
+        && ./configure --prefix=/usr \
+        && make install \
+        && cd .. \
+        && rm -rf dnscrypt-wrapper \
+    && apt-get remove -y build-essential \
+                         git \
+                         libevent-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /var/lib/dnscrypt-wrapper \
+    && cd /var/lib/dnscrypt-wrapper \
+    && dnscrypt-wrapper --gen-provider-keypair > provider_keypair.txt \
+    && dnscrypt-wrapper --gen-crypt-keypair > crypt_keypair.txt \
+    && dnscrypt-wrapper --crypt-publickey-file=crypt_public.key \
+                        --crypt-secretkey-file=crypt_secret.key \
+                        --provider-publickey-file=public.key \
+                        --provider-secretkey-file=secret.key \
+                        --gen-cert-file > cert_file.txt
+
+ENV RESOLVER_ADDR 8.8.8.8
+ENV RESOLVER_PORT 53
+ENV LISTEN_ADDR 0.0.0.0
+ENV LISTEN_PORT 443
+ENV PROVIDER_NAME 2.dnscrypt-cert.yourdomain.com
+
+WORKDIR /var/lib/dnscrypt-wrapper
+VOLUME /var/lib/dnscrypt-wrapper
+EXPOSE 443/tcp 443/udp
+
+CMD dnscrypt-wrapper -r ${RESOLVER_ADDR}:${RESOLVER_PORT} \
+                     -a ${LISTEN_ADDR}:${LISTEN_PORT} \
+                     --crypt-publickey-file=crypt_public.key \
+                     --crypt-secretkey-file=crypt_secret.key \
+                     --provider-cert-file=dnscrypt.cert \
+                     --provider-name=${PROVIDER_NAME} \
+                     -VV
+
diff --git a/dnscrypt/wrapper/README.md b/dnscrypt/wrapper/README.md
new file mode 100644
index 0000000..0543042
--- /dev/null
+++ b/dnscrypt/wrapper/README.md
@@ -0,0 +1,3 @@
+[`dnscrypt-wrapper`][1] - A server-side dnscrypt proxy.
+
+[1]: https://github.com/Cofyc/dnscrypt-wrapper
diff --git a/scrapyd/Dockerfile b/scrapyd/Dockerfile
index a070bf1..66d9eb6 100644
--- a/scrapyd/Dockerfile
+++ b/scrapyd/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Dockerfile for scrapyd-onbuild
+# Dockerfile for scrapyd
 #
 
 FROM debian:jessie