diff --git a/docker/1.6-openssl/Dockerfile b/docker/1.6-openssl/Dockerfile
index 8cc94464..3c6287bc 100644
--- a/docker/1.6-openssl/Dockerfile
+++ b/docker/1.6-openssl/Dockerfile
@@ -3,8 +3,8 @@ FROM alpine:3.12
 LABEL maintainer="Roger Light <roger@atchoo.org>" \
     description="Eclipse Mosquitto MQTT Broker"
 
-ENV VERSION=1.6.10 \
-    DOWNLOAD_SHA256=92d1807717f0f6d57d1ac1207ffdb952e8377e916c7b0bb4718f745239774232 \
+ENV VERSION=1.6.11 \
+    DOWNLOAD_SHA256=b02d8f1368c40d5779ee125c37daf9003608eb47d7fbb04c5b938c76c1230a1f \
     GPG_KEYS=A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7 \
     LWS_VERSION=2.4.2
 
diff --git a/docker/1.6-openssl/docker-entrypoint.sh b/docker/1.6-openssl/docker-entrypoint.sh
index b381ac57..85099f54 100755
--- a/docker/1.6-openssl/docker-entrypoint.sh
+++ b/docker/1.6-openssl/docker-entrypoint.sh
@@ -1,4 +1,15 @@
 #!/bin/ash
 set -e
 
+docker_set_permissions() {
+	local user; user="$(id -u)"
+
+	if [ "$user" = '0' ]; then
+		chown -R mosquitto:mosquitto /mosquitto
+	fi
+}
+
+
+docker_set_permissions()
+
 exec "$@"
diff --git a/docker/1.6/Dockerfile b/docker/1.6/Dockerfile
index 7f725437..4fb7a5e8 100644
--- a/docker/1.6/Dockerfile
+++ b/docker/1.6/Dockerfile
@@ -3,8 +3,8 @@ FROM alpine:3.12
 LABEL maintainer="Roger Light <roger@atchoo.org>" \
     description="Eclipse Mosquitto MQTT Broker"
 
-ENV VERSION=1.6.10 \
-    DOWNLOAD_SHA256=92d1807717f0f6d57d1ac1207ffdb952e8377e916c7b0bb4718f745239774232 \
+ENV VERSION=1.6.11 \
+    DOWNLOAD_SHA256=b02d8f1368c40d5779ee125c37daf9003608eb47d7fbb04c5b938c76c1230a1f \
     GPG_KEYS=A0D6EEA1DCAE49A635A3B2F0779B22DFB3E717B7 \
     LWS_VERSION=2.4.2
 
diff --git a/docker/README.md b/docker/README.md
index ff53a2b4..0314c244 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,8 +2,14 @@
 
 This directory contains Docker files for Mosquitto.
 
-The `1.5` directory contains the latest version of Mosquitto for
-that series, and provide the basis of the official image.
+The `1.6` directory contains the latest version of Mosquitto for
+that series, and provide the basis of the official image. It uses libressl. The
+`1.6-openssl` directory is identical except that it uses openssl instead of
+libressl, and enables TLS-PSK support.
+
+The `1.5` directory contains the version of Mosquitto based on the 1.5 branch.
+It uses libressl. The `1.5-openssl` directory is identical except that it uses
+openssl instead of libressl, and enables TLS-PSK support.
 
 The `generic` directory contains a generic Dockerfile that can be used to build
 arbitrary versions of Mosquitto based on the released tarballs as follows: