diff --git a/debian/changelog b/debian/changelog
index 7ba24709..16edddf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,6 +70,10 @@ byobu (4.47) unreleased; urgency=low
       is any longer one of byobu's main features (?)
     - standardize title formatting
     - clean up some whitespace and text
+  * usr/bin/byobu-config, usr/share/doc/byobu/help.tmux.txt,
+    usr/share/doc/byobu/help.txt => usr/share/doc/byobu/help.screen.txt,
+    usr/share/doc/byobu/Makefile.am:
+    - show tmux help in tmux, screen help in screen
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 08 Nov 2011 19:16:15 -0600
 
diff --git a/usr/bin/byobu-config b/usr/bin/byobu-config
index f8ca8159..b1fdbf2d 100755
--- a/usr/bin/byobu-config
+++ b/usr/bin/byobu-config
@@ -112,16 +112,16 @@ def messagebox(snackScreen, width, height, title, text, scroll=0, \
     return bb.buttonPressed(g.runOnce())
 
 def help(snackScreen, size, config):
-    f=file(DOC+'/help.txt')
+    f=file(DOC+'/help.'+BYOBU_BACKEND+'.txt')
     text=f.read()
     f.close()
     text=text.replace("<esckey>", getesckey(), 1)
     text=text.replace("_VER_", commands.getoutput("byobu -v | head -n1 | " + SED + " 's/.* //'"), 1)
-    t = Textbox(70, 14, text, scroll=0)
+    t = Textbox(67, 16, text, scroll=1, wrap=1)
     bb = ButtonBar(snackScreen, ((_("Menu"), "menu", ESC),), compact = 1)
-    g = GridForm(snackScreen, _("Byobu Help"), 1, 3)
-    g.add(t, 0, 0, padding=(0,0,0,0))
-    g.add(bb, 0, 2, padding=(1,1,0,0))
+    g = GridForm(snackScreen, _("Byobu Help"), 2, 4)
+    g.add(t, 1, 0)
+    g.add(bb, 1, 1, padding=(1,1,0,0))
     button = bb.buttonPressed(g.runOnce())
     return 100
 
diff --git a/usr/share/doc/byobu/Makefile.am b/usr/share/doc/byobu/Makefile.am
index 3ac179ba..23ee29de 100644
--- a/usr/share/doc/byobu/Makefile.am
+++ b/usr/share/doc/byobu/Makefile.am
@@ -1,2 +1,2 @@
 docdir = $(datadir)/doc/@PACKAGE@
-doc_DATA = help.txt help.tmux.txt
+doc_DATA = help.screen.txt help.tmux.txt
diff --git a/usr/share/doc/byobu/help.txt b/usr/share/doc/byobu/help.screen.txt
similarity index 100%
rename from usr/share/doc/byobu/help.txt
rename to usr/share/doc/byobu/help.screen.txt
diff --git a/usr/share/doc/byobu/help.tmux.txt b/usr/share/doc/byobu/help.tmux.txt
index bfb34cb2..0f644d18 100644
--- a/usr/share/doc/byobu/help.tmux.txt
+++ b/usr/share/doc/byobu/help.tmux.txt
@@ -2,33 +2,33 @@ Byobu is a suite of enhancements to tmux, as a command line
 tool providing live system status, dynamic window management,
 and some convenient keybindings:
 
-  F1				* Used by X11
-    Shift-F1			Display this help
-  F2				Create a new window
-    Shift-F2			Create a horizontal split
-    Ctrl-F2			Create a vertical split
-    Ctrl-Shift-F2		Create a new session
-  F3/F4				Move focus among windows
-    Shift-F3/F4			Move focus among splits
-    Ctrl-F3/F4			Move a split
-    Alt-Left/Right		Move focus among windows
-    Alt-Up/Down			Move focus among sessions
-    Shift-Left/Right/Up/Down	Move focus among splits
-    Ctrl-Left/Right/Up/Down	Resize a split
-  F5				Reload profile, refresh notifications
-    Shift-F5			Toggle through split arrangements
-    Ctrl-F5			Reconnect ssh/gpg/dbus sockets
-  F6				Detach session and then logout
-    Shift-F6			Detach session and do not logout
-    Ctrl-F6			Kill split in focus
-  F7				Enter scrollback history
-    Alt-PageUp/PageDown		Enter and move through scrollback
-  F8				Rename the current window
-  F9				Launch byobu-config window
-  F10				* Used by X11
-  F11				* Used by X11
-    Alt-F11			Expand split to a full window
-    Shift-F11			Join window into a horizontal split
-    Ctrl-F11			Join window into a vertical split
-  F12				Escape sequence
-    Shift-F12			Toggle on/off Byobu's keybindings
+  F1                            * Used by X11 *
+    Shift-F1                    Display this help
+  F2                            Create a new window
+    Shift-F2                    Create a horizontal split
+    Ctrl-F2                     Create a vertical split
+    Ctrl-Shift-F2               Create a new session
+  F3/F4                         Move focus among windows
+    Shift-F3/F4                 Move focus among splits
+    Ctrl-F3/F4                  Move a split
+    Alt-Left/Right              Move focus among windows
+    Alt-Up/Down                 Move focus among sessions
+    Shift-Left/Right/Up/Down    Move focus among splits
+    Ctrl-Left/Right/Up/Down     Resize a split
+  F5                            Reload profile, refresh status
+    Shift-F5                    Toggle through split arrangements
+    Ctrl-F5                     Reconnect ssh/gpg/dbus sockets
+  F6                            Detach session and then logout
+    Shift-F6                    Detach session and do not logout
+    Ctrl-F6                     Kill split in focus
+  F7                            Enter scrollback history
+    Alt-PageUp/PageDown         Enter and move through scrollback
+  F8                            Rename the current window
+  F9                            Launch byobu-config window
+  F10                           * Used by X11 *
+  F11                           * Used by X11 *
+    Alt-F11                     Expand split to a full window
+    Shift-F11                   Join window into a horizontal split
+    Ctrl-F11                    Join window into a vertical split
+  F12                           Escape sequence
+    Shift-F12                   Toggle on/off Byobu's keybindings