diff --git a/1.10/dind/Dockerfile b/1.10/dind/Dockerfile
index 3ba3220f8..20501c265 100644
--- a/1.10/dind/Dockerfile
+++ b/1.10/dind/Dockerfile
@@ -11,6 +11,13 @@ RUN apk add --no-cache \
 
 # TODO aufs-tools
 
+# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
+RUN set -x \
+	&& addgroup -S dockremap \
+	&& adduser -S -G dockremap dockremap \
+	&& echo 'dockremap:165536:65536' >> /etc/subuid \
+	&& echo 'dockremap:165536:65536' >> /etc/subgid
+
 ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
 
 RUN wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \
diff --git a/1.11/dind/Dockerfile b/1.11/dind/Dockerfile
index 7b60e6ea1..49f637708 100644
--- a/1.11/dind/Dockerfile
+++ b/1.11/dind/Dockerfile
@@ -11,6 +11,13 @@ RUN apk add --no-cache \
 
 # TODO aufs-tools
 
+# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
+RUN set -x \
+	&& addgroup -S dockremap \
+	&& adduser -S -G dockremap dockremap \
+	&& echo 'dockremap:165536:65536' >> /etc/subuid \
+	&& echo 'dockremap:165536:65536' >> /etc/subgid
+
 ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
 
 RUN wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \
diff --git a/1.12-rc/dind/Dockerfile b/1.12-rc/dind/Dockerfile
index 4e14f4430..8a514274f 100644
--- a/1.12-rc/dind/Dockerfile
+++ b/1.12-rc/dind/Dockerfile
@@ -11,6 +11,13 @@ RUN apk add --no-cache \
 
 # TODO aufs-tools
 
+# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
+RUN set -x \
+	&& addgroup -S dockremap \
+	&& adduser -S -G dockremap dockremap \
+	&& echo 'dockremap:165536:65536' >> /etc/subuid \
+	&& echo 'dockremap:165536:65536' >> /etc/subgid
+
 ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
 
 RUN wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \