diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 6279d77b5..4647bd4e8 100644
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -135,9 +135,10 @@ extern int lxc_setup_fs(void)
 		return -1;
 
 	/* If we were able to mount /dev/shm, then /dev exists */
+	/* Sure, but it's read-only per config :) */
 	if (access("/dev/mqueue", F_OK) && mkdir("/dev/mqueue", 0666)) {
-		SYSERROR("failed to create '/dev/mqueue'");
-		return -1;
+		DEBUG("failed to create '/dev/mqueue'");
+		return 0;
 	}
 
 	if (mount_fs("mqueue", "/dev/mqueue", "mqueue"))
diff --git a/templates/lxc-sshd.in b/templates/lxc-sshd.in
index 0e8346f90..bd5d293e8 100644
--- a/templates/lxc-sshd.in
+++ b/templates/lxc-sshd.in
@@ -30,6 +30,7 @@ $rootfs/var/empty/sshd \
 $rootfs/var/lib/empty/sshd \
 $rootfs/etc/ssh \
 $rootfs/dev/shm \
+$rootfs/run/shm \
 $rootfs/proc \
 $rootfs/bin \
 $rootfs/sbin \