diff --git a/debian/changelog b/debian/changelog
index 529ba3b0..9a5bf0e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 byobu (5.83) unreleased; urgency=medium
 
   [ Dustin Kirkland ]
-  * usr/bin/byobu-config.in:
+  * usr/bin/byobu-config.in: LP: #1316050
     - hard code LANG=C before launching byobu-config
+  * usr/lib/byobu/include/dirs.in: LP: #1346869
+    - be little smarter about detecting a usable /dev/shm
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 22 Jul 2014 07:21:56 -0700
 
diff --git a/usr/lib/byobu/include/dirs.in b/usr/lib/byobu/include/dirs.in
index b84cd665..8821bacd 100755
--- a/usr/lib/byobu/include/dirs.in
+++ b/usr/lib/byobu/include/dirs.in
@@ -59,7 +59,8 @@ if [ -w /dev/shm ]; then
 	if [ ! -d "$BYOBU_RUN_DIR" ] || [ ! -O "$BYOBU_RUN_DIR" ]; then
 		export BYOBU_RUN_DIR=$(mktemp -d /dev/shm/$PKG-$USER-XXXXXXXX)
 	fi
-else
+fi
+if [ ! -d "$BYOBU_RUN_DIR" ] || [ ! -O "$BYOBU_RUN_DIR" ] || [ ! -w "$BYOBU_RUN_DIR" ]; then
 	# For distros that don't have a /dev/shm, use local disk
 	if [ -d "$XDG_CACHE_HOME" ]; then
 		# Use XDG, as some users insist on such nonsense :-)