diff --git a/debian/changelog b/debian/changelog
index 442e01a9..abfbbf7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ byobu (4.50) unreleased; urgency=low
 
   * usr/bin/byobu-mondrian:
     - clean up code, make idempotent
+  * usr/bin/byobu-mondrian => usr/lib/byobu/include/modrian,
+    usr/lib/byobu/include/Makefile.am, usr/share/byobu/keybindings/f-
+    keys.tmux, usr/share/byobu/keybindings/f-keys.tmux.disable,
+    usr/share/doc/byobu/help.tmux.txt:
+    - install modrian
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 18 Nov 2011 15:41:36 -0600
 
diff --git a/usr/lib/byobu/include/Makefile.am b/usr/lib/byobu/include/Makefile.am
index fc8aec1b..927411e1 100644
--- a/usr/lib/byobu/include/Makefile.am
+++ b/usr/lib/byobu/include/Makefile.am
@@ -1,2 +1,2 @@
 inclibdirdir = $(prefix)/lib/@PACKAGE@/include
-inclibdir_SCRIPTS = common constants dirs notify_osd shutil
+inclibdir_SCRIPTS = common constants dirs modrian notify_osd shutil
diff --git a/usr/bin/byobu-mondrian b/usr/lib/byobu/include/modrian
similarity index 96%
rename from usr/bin/byobu-mondrian
rename to usr/lib/byobu/include/modrian
index 94294b41..a654b459 100755
--- a/usr/bin/byobu-mondrian
+++ b/usr/lib/byobu/include/modrian
@@ -1,7 +1,7 @@
 #!/bin/bash
-# N.B.: Use bash for $RANDOm
+# N.B.: Use bash for $RANDOM
 #
-#    byobu-mondrian: randomly generate some Modrian art in tmux
+#    mondrian: randomly generate some Modrian art in tmux
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index 2b7055db..a898ae9b 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -65,3 +65,4 @@ bind-key -n M-F11 break-pane
 bind-key -n C-F11 join-pane -h -s :. -t :-1
 bind-key -n S-F11 join-pane -v -s :. -t :-1
 bind-key -n S-F12 source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.tmux.disable
+bind-key -n C-S-F12 new-window -d $BYOBU_PREFIX/lib/byobu/include/mondrian
diff --git a/usr/share/byobu/keybindings/f-keys.tmux.disable b/usr/share/byobu/keybindings/f-keys.tmux.disable
index 572625a7..fdd2b741 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux.disable
+++ b/usr/share/byobu/keybindings/f-keys.tmux.disable
@@ -61,3 +61,4 @@ unbind-key -n M-F11
 unbind-key -n C-F11
 unbind-key -n S-F11
 bind-key -n S-F12 source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.tmux
+unbind-key -n C-S-F12
diff --git a/usr/share/doc/byobu/help.tmux.txt b/usr/share/doc/byobu/help.tmux.txt
index d60f1d6d..9e1690c9 100644
--- a/usr/share/doc/byobu/help.tmux.txt
+++ b/usr/share/doc/byobu/help.tmux.txt
@@ -34,3 +34,4 @@ and some convenient keybindings:
     Ctrl-F11                    Join window into a vertical split
   F12                           Escape sequence
     Shift-F12                   Toggle on/off Byobu's keybindings
+    Ctrl-Shift-F12		Modrian squares