diff --git a/debian/changelog b/debian/changelog
index cdbb37dd..8cae42a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ byobu (3.2) unreleased; urgency=low
   * usr/lib/byobu/network, usr/share/man/man1/byobu.1: allow for
     configuration of network traffic in [kM]ps, LP: #578377
   * configure.ac: POSIX sed doesn't include -i option, LP: #619328, #622640
+  * usr/bin/byobu-janitor: improve dash replacement in status config,
+    LP: #598488
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 03 Aug 2010 15:19:23 -0400
 
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 636e747c..4bc036b8 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -111,7 +111,7 @@ fi
 # The status scripts used to have hyphens in their name, but now use
 # underscores such that we can source the file as a shell snippet;
 # fix existing status configuration.
-sed -i "s/\(.*\)-\(.*\)=/\1_\2=/g" "$HOME/.$PKG/status"
+sed -i "s/\([^=]+\)-\([^=]+\)=/\1_\2=/g" "$HOME/.$PKG/status"
 sed -i "s/^disk-.*=/disk=/" "$HOME/.$PKG/status"
 sed -i "s/^network-.*=/network=/" "$HOME/.$PKG/status"