diff --git a/byobu-status b/byobu-status
index 4159d550..9da19f8f 100755
--- a/byobu-status
+++ b/byobu-status
@@ -77,7 +77,7 @@ case "$P" in
 			[ "$i" = "menu" ] && continue
 			short=`"$DIR"/$i --short | sed 's/^\s*//' | sed 's/\s*$//' | sed 's/.{[^}]*}//g'` || true
 			detail=`"$DIR"/$i --detail | sed '/^$/d' | sed 's/^/\t/g'` || true
-			printf "%-15s (%s)\n" "$short" "$i"
+			printf "%s\n\t(%s)\n" "$short" "$i"
 			[ -n "$detail" ] && printf "%s\n" "$detail"
 		done
 		exit 0
diff --git a/debian/changelog b/debian/changelog
index 89174e4a..5aa7d33f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ byobu (2.2) jaunty; urgency=low
 
   * bin/cpu-count: print cpu model names for --detail
   * byobu-status: print the short description (matching the status
-    in the lower bar) first, then the description in parens
+    in the lower bar) first, then the description in parens in the
+    first line of the indented/folded text
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 07 May 2009 13:27:41 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 07 May 2009 15:56:34 -0500
 
 byobu (2.1-0ubuntu1) karmic; urgency=low