diff --git a/config/templates/plamo.common.conf.in b/config/templates/plamo.common.conf.in
index 483a5569a..22d92074b 100644
--- a/config/templates/plamo.common.conf.in
+++ b/config/templates/plamo.common.conf.in
@@ -3,6 +3,7 @@ lxc.include = @LXCTEMPLATECONFIG@/common.conf
 
 # Default mount
 lxc.mount.auto = proc sys cgroup
+lxc.mount.entry = none dev/shm tmpfs nosuid,nodev,noexec,mode=1777 0 0
 
 # Doesn't support consoles in /dev/lxc/
 lxc.devttydir =
diff --git a/templates/lxc-plamo.in b/templates/lxc-plamo.in
index ce98c1a5f..5061056e8 100644
--- a/templates/lxc-plamo.in
+++ b/templates/lxc-plamo.in
@@ -153,6 +153,7 @@ configure_plamo() {
   chmod    666 $rootfs/dev/random
   mknod -m 666 $rootfs/dev/urandom c 1 9
   mkdir -m 755 $rootfs/dev/pts
+  mkdir -m 755 $rootfs/dev/shm
   chmod    666 $rootfs/dev/tty
   chmod    600 $rootfs/dev/console
   mknod -m 666 $rootfs/dev/tty0 c 4 0