diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 06b027023..b53b3c352 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -57,8 +57,7 @@ $Id$
       Pere Pujal i Carabantes <pere@fornol.no-ip.org>
 
     * Added an option to display an on-screen keyboard when using the
-      'Text' and 'Label' tools. (Experimental.)
-      ("--onscreen-keyboard")
+      'Text' and 'Label' tools.  ("--onscreen-keyboard") [Experimental!]
       by Ankit Choudary <ankit.goaldecided@gmail.com> (GSOC 2009)
       with integration and fixes by
       Pere Pujal i Carabantes <pere@fornol.no-ip.org>
@@ -89,6 +88,33 @@ $Id$
           QWERTY-style layouts; maybe more in others? big world out there!)
         * Needs a space key! (5th row?)
 
+    * Keyboard can be used to move and click mouse ("keymouse").
+      [Experimental!]
+
+      * Keys to move:
+        * [Up] / [Down] / [Left] / [Right]
+        * [A] / [S] / [D] / [W]
+        * Numpad 1/2/3/4/6/7/8/9
+
+      * Keys to click:
+        * [\] (backslash)
+        * Numpad 5
+
+      * [Tab] can be used to jump between Tools (toolbox on the left),
+        Colors (color palette at the bottom) and drawing canvas.
+
+      Note: disabled when using Text or Label tool to type, so that you
+      can type text, and use [Tab] to end a string (without moving text
+      cursor).
+
+      * FIXME:
+        * Difficult to actually draw, unless mouse-accessibility is also on.
+        * Option is on by default; should be disabled by default, and enabled
+          via config.
+        * ASDW is QWERTY-centric; drop it, or add ways to support other
+          keyboard layouts.
+        * Who wrote this, so we can credit!?!?
+
   * Other Improvements:
     -------------------
     * Quicker prompt window pop-up animation.
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 5105b2aeb..3f8acb909 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -984,7 +984,7 @@ static int alt_print_command_default = ALTPRINT_MOD;
 static int want_alt_printcommand;
 
 static int wheely = 1;
-static int keymouse;
+static int keymouse = 1; /* FIXME: Should be off by default -bjk 2011.04.15 */
 static int mouse_x;
 static int mouse_y;
 static int no_button_distinction;