diff --git a/debian/changelog b/debian/changelog
index 7650b8bf..a10427c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,13 @@ byobu (4.18) unreleased; urgency=low
       this for all the relevant options that I could see in the screen
       manpage.
 
+  [ James Hunt ]
+  * usr/bin/byobu-ulevel:
+    - Added faces_2 theme.
+    - Allow permissive mode to be set via command-line ('-p').
+  * usr/lib/byobu/time_binary: remove stray trailing space character in
+    output.
+
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 29 Jun 2011 02:26:28 +0000
 
 byobu (4.17-0ubuntu1) oneiric; urgency=low
diff --git a/usr/bin/byobu-ulevel b/usr/bin/byobu-ulevel
index 1db3dbcd..4507180d 100755
--- a/usr/bin/byobu-ulevel
+++ b/usr/bin/byobu-ulevel
@@ -46,6 +46,7 @@ hearts_2=(♡ ♥)
 squares_2=(◻ ◼)
 squares_small_2=(◽ ◾)
 stars_2=(☆ ★)
+faces_2=(☹ ☺)
 
 #------------------------------
 # Themes with 4 values.
@@ -443,6 +444,10 @@ do
       newline=-n
     ;;
 
+    p)
+      permissive=y
+    ;;
+
     q)
       quiet=y
     ;;
diff --git a/usr/lib/byobu/time_binary b/usr/lib/byobu/time_binary
index d4423c31..8b3967e1 100755
--- a/usr/lib/byobu/time_binary
+++ b/usr/lib/byobu/time_binary
@@ -169,5 +169,5 @@ else
   display_time="${hh}${sep}${hm}${hs}${ending}"
 fi
 
-echo -ne "$display_time "
+echo -ne "$display_time"
 exit 0