diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt
index a8ee64638..123483f97 100644
--- a/docs/AUTHORS.txt
+++ b/docs/AUTHORS.txt
@@ -7,7 +7,7 @@ bill@newbreedsoftware.com
 http://www.tuxpaint.org/
 
 
-June 17, 2002 - May 25, 2011
+June 17, 2002 - May 28, 2011
 
 $Id$
 
@@ -99,8 +99,13 @@ $Id$
   http://pippin.gimp.org/plug-ins/gluas/
 
   Mouse accessibility code and keyboard access
-  Ankit Choudary <ankit.goaldecided@gmail.com>
-  as part of GSOC 2010.
+  Ankit Choudary <ankit.goaldecided@gmail.com>, as part of GSOC 2010,
+  with integration and fixes by Pere Pujal i Carabantes <pere@fornol.no-ip.org>
+
+  Joystick control
+  Ankit Choudary <ankit.goaldecided@gmail.com>, as part of GSOC 2010,
+  with integration and fixes by Pere Pujal i Carabantes <pere@fornol.no-ip.org>
+
 
 * Graphics
 
diff --git a/docs/OPTIONS.txt b/docs/OPTIONS.txt
index 8eb3da054..635e48fc3 100644
--- a/docs/OPTIONS.txt
+++ b/docs/OPTIONS.txt
@@ -9,7 +9,7 @@ Options Documentation
                            bill@newbreedsoftware.com
                             http://www.tuxpaint.org/
 
-                                 April 15, 2011
+                                  May 28, 2011
 
      ----------------------------------------------------------------------
 
@@ -378,17 +378,18 @@ Windows Users
                Presents a clickable on-screen keyboard when using the Text
                and Label tools.
 
-       joystick-slowness=number
-               Sets a delay at each axis motion, allowing to slow the joystick.
-	       Allowed values are 0 to 500. Default value is 15.
+       joystick-slowness=SPEED
+               Sets a delay at each axis motion, allowing to slow the
+               joystick. Allowed values are 0 to 500. Default value is 15.
 
-       joystick-threshold
-	       Sets the minimum level of axis motion to start moving the pointer.
-	       Allowed values are from 0 to 32766. Default value is 3200.
+       joystick-threshold=THRESHOLD
+               Sets the minimum level of axis motion to start moving the
+               pointer. Allowed values are from 0 to 32766. Default value is
+               3200.
 
-       joystick-maxsteps
-	       Sets the maximum pixels the pointer will move at once.
-	       Allowed values are from 1 to 7. Default value is 7.
+       joystick-maxsteps=STEPS
+               Sets the maximum pixels the pointer will move at once. Allowed
+               values are from 1 to 7. Default value is 7.
 
        stampsize=SIZE
 
@@ -772,7 +773,8 @@ Windows Users
          --noquit
          --noprint
          --printdelay=SECONDS
-         --printcfg         --altprintnever
+         --printcfg
+         --altprintnever
          --altprintalways
          --papersize=PAPERSIZE
          --nolockfile
@@ -791,9 +793,6 @@ Windows Users
          --nolabel
          --mouse-accessibility
          --onscreen-keyboard
-	 --joystick-slowness
-	 --joystick-threshold
-	 --joystick-maxsteps
          --sysfonts
          --alllocalefonts
          --mirrorstamps
diff --git a/docs/html/OPTIONS.html b/docs/html/OPTIONS.html
index b1626ce86..21f5467c1 100644
--- a/docs/html/OPTIONS.html
+++ b/docs/html/OPTIONS.html
@@ -23,7 +23,7 @@ New Breed Software</p>
 <a href="http://www.tuxpaint.org/">http://www.tuxpaint.org/</a></p>
 
 
-<p>April 15, 2011</p>
+<p>May 28, 2011</p>
 
 
 </center>
@@ -472,6 +472,24 @@ New Breed Software</p>
     <b>Label</b> tools.
   </dd>
 
+  <dt><code><b>joystick-slowness=<i>SPEED</i></b></code></dt>
+  <dd>
+    Sets a delay at each axis motion, allowing to slow the joystick.
+    Allowed values are 0 to 500. Default value is 15.
+  </dd>
+
+  <dt><code><b>joystick-threshold=<i>THRESHOLD</i></b></code></dt>
+  <dd>
+    Sets the minimum level of axis motion to start moving the pointer.
+    Allowed values are from 0 to 32766. Default value is 3200.
+  </dd>
+
+  <dt><code><b>joystick-maxsteps=<i>STEPS</i></b></code></dt>
+  <dd>
+    Sets the maximum pixels the pointer will move at once.
+    Allowed values are from 1 to 7. Default value is 7.
+  </dd>
+
   <dt><code><b>stampsize=<i>SIZE</i></b></code></dt>
   <dd>
     <p>Use this option to force Tux&nbsp;Paint to set the starting size of
diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1
index d658d4004..3937bac96 100644
--- a/src/manpage/tuxpaint.1
+++ b/src/manpage/tuxpaint.1
@@ -1,5 +1,5 @@
-.\" tuxpaint.1 - 2011.04.15
-.TH TUXPAINT 1 "15 April 2011" "0.9.22" "Tux Paint"
+.\" tuxpaint.1 - 2011.05.28
+.TH TUXPAINT 1 "28 May 2011" "0.9.22" "Tux Paint"
 .SH NAME
 tuxpaint -- "Tux Paint", a drawing program for young children.
 
@@ -67,6 +67,12 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-onscreen-keyboard]
 .br
+[\-\-joystick-slowness=\fISPEED\fP]
+.br
+[\-\-joystick-threshold=\fITHRESHOLD\fP]
+.br
+[\-\-joystick-maxsteps=\fISTEPS\fP]
+.br
 [\-\-stampsize=\fISIZE\fP]
 .br
 [\-\-keyboard]