diff --git a/debian/changelog b/debian/changelog
index 6555d457..f7767134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ byobu (4.32) unreleased; urgency=low
     - fix a suite of support issues around launching byobu under sudo,
       where files/dirs would be created under the $SUDO_USER's $HOME,
       but would be owned by root
+  * usr/lib/byobu/.dirs: LP: #833780
+    - save a fork
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 23 Aug 2011 23:23:49 -0500
 
diff --git a/usr/lib/byobu/.dirs b/usr/lib/byobu/.dirs
index 646a3bee..af08959a 100755
--- a/usr/lib/byobu/.dirs
+++ b/usr/lib/byobu/.dirs
@@ -44,9 +44,10 @@ if [ -d "$XDG_CACHE_HOME" ]; then
 elif [ -d "$SOCKETDIR/S-$USER" ]; then
 	# But for FAR better performance, use a tmpfs if available
 	export BYOBU_RUN_DIR="$SOCKETDIR/S-$USER/$PKG"
-elif [ -n "$TMUX" ] && [ -d "$(dirname $TMUX)" ]; then
+elif [ -n "$TMUX" ] && [ d=$(dirname "$TMUX") ] && [ -d "$d" ]; then
 	# Or perhaps try the tmux tmpdir
-	export BYOBU_RUN_DIR="$(dirname $TMUX)/$PKG"
+	export BYOBU_RUN_DIR="$d"
+	d=
 else
 	# But if not, we'll use a cache directory
 	export BYOBU_RUN_DIR="$HOME/.cache/$PKG"