diff --git a/debian/changelog b/debian/changelog
index a3276f3f..52878a99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 byobu (4.18) unreleased; urgency=low
 
+  [ Dustin Kirkland ]
   * usr/bin/byobu, usr/bin/byobu-status:
     - remove some redundancies
   * usr/bin/byobu, usr/bin/byobu-config, usr/bin/byobu-ctrl-a,
@@ -31,6 +32,11 @@ byobu (4.18) unreleased; urgency=low
   [ James Spencer ]
   * usr/lib/byobu/.constants:
     - fix syntax error
+  * usr/bin/byobu:
+    - byobu shouldn't overwrite the screen name if given options to pass
+      onto screen which explicitly set the screen name. This patch stops
+      this for all the relevant options that I could see in the screen
+      manpage.
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 29 Jun 2011 02:26:28 +0000
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index ef766c64..ad636908 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -84,7 +84,7 @@ fi
 NAME="-S $PKG"
 # Zero out $NAME if user has specified a session name
 for i in "$@"; do
-	case $i in -r|-*S|-ls|-list) NAME= ;; esac
+	case $i in -*r*|-*d*|-*D*|-*S*|-ls|-list) NAME= ;; esac
 done
 # Now let's execute the backend!
 if [ "$#" = "0" ]; then