diff --git a/debian/changelog b/debian/changelog
index 84190814..75f9623f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ byobu (4.2) unreleased; urgency=low
   * usr/bin/byobu-config: remove debug output, LP: #782372
   * usr/lib/byobu/disk_io: fix minor bug in 'command' call
   * usr/lib/byobu/.shutil (properties changed: -x to +x): fix perm
+  * usr/bin/byobu-janitor: fix regression, ensure we can run from
+    a clean setup
 
   [ Scott Moser ]
   * usr/bin/byobu, usr/bin/byobu-reconnect-sockets,
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 17d85d50..d5ea05ee 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -31,7 +31,7 @@ FLAG="$RUN/$PKG.reload-required"
 mkdir -p "$XDG"
 if [ ! -h "$DATA" ]; then
 	mv -f "$DATA"/* "$DATA"/.* "$XDG" 2>/dev/null || true
-	rmdir "$DATA"
+	rmdir "$DATA" 2>/dev/null || true
 fi
 ln -sf "$XDG" "$DATA"