diff --git a/bin/disk-used b/bin/disk-used
index 65987790..95b5f491 100755
--- a/bin/disk-used
+++ b/bin/disk-used
@@ -32,5 +32,5 @@ fi
 # Default to /, but let users override
 [ -r "$HOME/.$PKG/disk" ] && MP=`cat "$HOME/.$PKG/disk"` || MP="/"
 
-df -h "$MP" | tail -n 1 | awk '{print "\005{= MW}" $5 "\005{-}"}'
-printf "%s" "$whitespace"
+used=`df -h "$MP" | tail -n 1 | sed "s/%.*$/%/" | sed "s/^.* //"`
+printf "\005{= MW}%s%s" "$used" "$whitespace"
diff --git a/debian/changelog b/debian/changelog
index 2b2f6050..aeeedfc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ byobu (2.4) unreleased; urgency=low
   * byobu: support Debian/Ubuntu's diversion of screen to screen.real,
     as well as RH, which does not divert the real screen binary
   * debian/release.sh: handle version incrementing in the rpm specfile
+  * bin/disk-used: fix situations where df output wraps to the next
+    line
   * bin/logo: check that lsb_release is available before using it
   * bin/release: try to grab both distro and version from /etc/issue
     if that's what we're forced to use
@@ -25,7 +27,7 @@ byobu (2.4) unreleased; urgency=low
   [ David Duffey ]
   * rpm/byobu.spec: initial specfile for RH packaging
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 14 May 2009 13:22:17 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 15 May 2009 17:16:44 +0100
 
 byobu (2.3-0ubuntu1) karmic; urgency=low