diff --git a/debian/changelog b/debian/changelog
index a9ee0280..760153d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ byobu (5.20) unreleased; urgency=low
   * usr/share/byobu/profiles/tmux: LP: #1012348
     - fix status activity/alert bolding
     - seems upstream tmux changed the option name from "alert" to "activity"
+  * usr/lib/byobu/logo: LP: #1004722
+    - add apple distro and logo
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 08 Jun 2012 17:25:23 -0500
 
diff --git a/usr/lib/byobu/logo b/usr/lib/byobu/logo
index 1e97fe94..3e823fd8 100755
--- a/usr/lib/byobu/logo
+++ b/usr/lib/byobu/logo
@@ -27,10 +27,12 @@ get_distro() {
 	elif [ -r "/etc/issue" ]; then
 		# Otherwise, check /etc/issue
 		_RET=`grep -m1 "^[A-Za-z]" /etc/issue`
-	elif which lsb_release >/dev/null 2>&1; then
+	elif $BYOBU_TEST lsb_release >/dev/null 2>&1; then
 		# This can be a very expensive operation, do it only
 		# if all other methods fail
 		_RET=`lsb_release -s -a 2>/dev/null`
+	elif $BYOBU_TEST sw_vers >/dev/null 2>&1; then
+		_RET=`sw_vers 2>/dev/null`
 	else
 		# No idea!
 		_RET="[B]"
@@ -95,6 +97,14 @@ __logo() {
 			logo=" > "
 			$MARKUP && printf "$(color b c w)%s$(color -)" "$logo" || printf "$logo"
 		;;
+		*mac*)
+			if [ "$BYOBU_BACKEND" = "tmux" ] && [ "$BYOBU_CHARMAP" = "UTF-8" ]; then
+			logo=" ⌘  "
+			else
+				logo=" X "
+			fi
+			$MARKUP && printf "$(color b k w)%s$(color -)" "$logo" || printf "$logo"
+		;;
 		*mandriva*)
 			logo=" (* "
 			$MARKUP && printf "$(color b k c) ($(color -)$(color b k y)*$(color -) " || printf "$logo"