diff --git a/debian/changelog b/debian/changelog
index 9515e8c9..7f866126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ byobu (3.4) unreleased; urgency=low
   * usr/share/byobu/keybindings/f-keys: make F1 also point to the menu,
     along with F9; this might help in some tty environments outside of
     gnome-terminal
+  * bin/byobu-janitor, share/byobu/keybindings/f-keys: use sed -e, for
+    Mac OS X compatibility, LP: #625387
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 24 Aug 2010 18:21:14 -0400
 
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index c8e9e165..aba21f7e 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -111,9 +111,9 @@ 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/^disk-.*=/disk=/" "$HOME/.$PKG/status"
-sed -i "s/^network-.*=/network=/" "$HOME/.$PKG/status"
+sed -i -e "s/\([^=]+\)-\([^=]+\)=/\1_\2=/g" "$HOME/.$PKG/status"
+sed -i -e "s/^disk-.*=/disk=/" "$HOME/.$PKG/status"
+sed -i -e "s/^network-.*=/network=/" "$HOME/.$PKG/status"
 
 # Affects: Upgrades from <= byobu-2.16
 # screen-launcher was renamed byobu-launcher; if the user has byobu
@@ -142,7 +142,7 @@ done
 # Affects: Upgrades from <= byobu-2.57 that autolaunch
 # If the global autolaunch is on, then remove duplicate entry in ~/.profile
 if [ -h "/etc/profile.d/Z98-$PKG.sh" ]; then
-	sed -i "/ $PKG-launcher/d" "$HOME"/.profile || true
+	sed -i -e "/ $PKG-launcher/d" "$HOME"/.profile || true
 fi
 
 # Affects: Upgrades from <= byobu-2.70 that autolaunch
@@ -154,7 +154,7 @@ fi
 # Affects: Upgrades from <= byobu-2.78 which might have "motd+shell"
 # in their window list; update this to just "shell"
 if grep -qs "motd+shell" "$HOME/.$PKG/windows"; then
-	sed -i "s/motd+shell/shell/g" "$HOME/.$PKG/windows" || true
+	sed -i -e "s/motd+shell/shell/g" "$HOME/.$PKG/windows" || true
 fi
 
 # Clean up flag
diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys
index a72ecde3..5db374b7 100644
--- a/usr/share/byobu/keybindings/f-keys
+++ b/usr/share/byobu/keybindings/f-keys
@@ -39,7 +39,7 @@ bind $ screen -t status 0 byobu-status-detail 		# ctrl-a $ | show detailed statu
 bind @ screen -t config 0 byobu-config			# ctrl-a @ | Configuration
 bind R process r					# ctrl-a R | Reload profile
 register s "^a[g G$>^h"					# Goes with ^a~ definition
-bind ~ eval 'process s' 'exec sed -i "/./,/^$/!d" /var/run/screen/S-$USER/byobu-exchange' 'echo "See: /var/run/screen/S-$USER/byobu-exchange"' # ctrl-a ~ | write the buffer to file
+bind ~ eval 'process s' 'exec sed -i -e "/./,/^$/!d" /var/run/screen/S-$USER/byobu-exchange' 'echo "See: /var/run/screen/S-$USER/byobu-exchange"' # ctrl-a ~ | write the buffer to file
 
 # toggle f-key keybindings off
 register d "^a:source $BYOBU_PREFIX/share/byobu/keybindings/screen-escape-keys^M"