diff --git a/debian/changelog b/debian/changelog
index b8011727..518501c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ byobu (3.10) unreleased; urgency=low
 
   * usr/lib/byobu/custom: fix typo in for loop, LP: #673728, thanks for
     the triage Jorge E. Gómez
+  * usr/bin/byobu-janitor: make sure this runs to completion, LP: #676605
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 12 Nov 2010 22:45:25 -0600
 
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 1af99283..bc4592f9 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -30,7 +30,7 @@ FLAG="$RUN/$PKG.reload-required"
 # Let's get prepped to switch over to XDG one day; maintain symlink for now
 mkdir -p "$XDG"
 if [ -d "$DATA" ] && [ ! -h "$DATA" ]; then
-	mv -f "$DATA"/* "$DATA"/.* "$XDG" 2>/dev/null
+	mv -f "$DATA"/* "$DATA"/.* "$XDG" 2>/dev/null || true
 	rmdir "$DATA"
 fi
 ln -sf "$XDG" "$DATA"