diff --git a/man/joystick.man b/man/joystick.man
index c23c47f..c10434a 100644
--- a/man/joystick.man
+++ b/man/joystick.man
@@ -72,10 +72,21 @@ is one of:
 .BI "\*qdeadzone="<number> \*q
 Sets the unresponsive range of the axis to
 .IR <number> .
+This can be between
+.IR "0" " and " "30000" .
+Default: 10
+.TP 7
+.BI "\*qamplify="<number> \*q
+Amplifies the influence of the axis. To make cursor movement slower, set to value 
+.IR \<1.0 .
+To make it faster, set to value
+.IR \>1.0 .
+Default: 1.0
+
 .RE
 .SH "SEE ALSO"
 __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
-Sascha Hlusiak.
+Sascha Hlusiak
 .fi
-Frederic Lepied.
+Frederic Lepied (1995-1999)
diff --git a/src/jstk.c b/src/jstk.c
index 4146ecc..7b8a728 100644
--- a/src/jstk.c
+++ b/src/jstk.c
@@ -48,33 +48,12 @@
 
 
 
-/******************************************************************************
- * debugging macro
- *****************************************************************************/
-#ifdef DBG
-#undef DBG
-#endif
-#ifdef DEBUG
-#undef DEBUG
-#endif
-
-#define DEBUG 1
-
-#if DEBUG
-static int      debug_level = 0;
-#define DBG(lvl, f) {if ((lvl) <= debug_level) f;}
-#else
-#define DBG(lvl, f)
-#endif
-
-
-
 /****************************************************************************
  * Forward declarations
  ****************************************************************************/
 
 static Bool xf86JstkProc(DeviceIntPtr pJstk, int what);
-
+int      debug_level = 0;
 
 
 /*
@@ -169,12 +148,13 @@ xf86JstkRead(LocalDevicePtr local)
   if ((event == EVENT_AXIS) && (priv->axis[number].mapping != MAPPING_NONE)) {
     switch (priv->axis[number].type) {
       case TYPE_BYVALUE:
-        jstkStartAxisByValueTimer(local, number);
-        break;
-      case TYPE_ACCELERATED: /* FIXME */
-
+      case TYPE_ACCELERATED:
+        if (priv->axis[number].value == 0)
+          priv->axis[number].temp = 1.0;
+        jstkStartAxisTimer(local, number);
         break;
       case TYPE_ABSOLUTE: /* FIXME */
+        jstkHandleAbsoluteAxis(local, number);
         break;
 
       default:
@@ -278,10 +258,9 @@ xf86JstkProc(DeviceIntPtr       pJstk,
       DBG(1, ErrorF("xf86JstkProc  what=%s\n", 
         (what == DEVICE_CLOSE) ? "CLOSE" : "OFF"));
 
-      for (i=0; i<MAXAXES; i++) if (priv->axis[i].timer != NULL) {
-        TimerFree(priv->axis[i].timer);
-        priv->axis[i].timer = NULL;
-        priv->axis[i].lasttimer = 0;
+      if (priv->timerrunning == TRUE) {
+        priv->timerrunning = FALSE;
+        TimerCancel(priv->timer);
       }
 
       if (local->fd >= 0)
@@ -369,6 +348,12 @@ xf86JstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 
     priv->fd = -1;
     priv->device = NULL;
+    priv->x  = 0.0;
+    priv->y  = 0.0;
+    priv->zx = 0.0;
+    priv->zy = 0.0;
+    priv->timer = NULL;
+    priv->timerrunning = FALSE;
 
     /* Initialize default mappings */
     for (i=0; i<MAXAXES; i++) {
@@ -376,8 +361,8 @@ xf86JstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
       priv->axis[i].deadzone  = 10;
       priv->axis[i].type      = TYPE_BYVALUE;
       priv->axis[i].mapping   = MAPPING_NONE;
-      priv->axis[i].timer     = NULL;
-      priv->axis[i].lasttimer = 0;
+      priv->axis[i].temp      = 1.0;
+      priv->axis[i].amplify   = 1.0;
     }
     for (i=0; i<MAXBUTTONS; i++) {
       priv->button[i].pressed = 0;
@@ -429,7 +414,7 @@ xf86JstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     }
 #else
     if (xf86SetIntOption(dev->commonOptions, "DebugLevel", 0) != 0) {
-      xf86Msg(X_WARNING, "%s: Compiled without Debug support!\n", 
+      xf86Msg(X_WARNING, "%s: DebugLevel: Compiled without Debug support!\n", 
         local->name);
     }
 #endif
@@ -472,6 +457,7 @@ xf86JstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
         char *param;
         char *tmp;
         int value;
+        float fvalue;
         param = xstrdup(s);
         for (tmp = param; *tmp; tmp++) *tmp = tolower(*tmp);
         xf86Msg(X_CONFIG, "%s: Option \"mapaxis%d\" \"%s\"\n", 
@@ -522,7 +508,16 @@ xf86JstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
           }else xf86Msg(X_WARNING, "%s: error parsing deadzone.\n", 
                         local->name);
         }
-
+        if ((s=strstr(param, "amplify=")) != NULL ) {
+          if (sscanf(s, "amplify=%f", &fvalue) == 1) {
+            if ((fvalue > 10000)||(fvalue < 0.00001))
+              xf86Msg(X_WARNING, 
+                "%s: amplifier of %.3f seems unreasonable. Ignored.\n", 
+                local->name, fvalue);
+            else priv->axis[i].amplify = fvalue;
+          }else xf86Msg(X_WARNING, "%s: error parsing amplifier.\n", 
+                        local->name);
+        }
 
         xfree(param);
       }
diff --git a/src/jstk.h b/src/jstk.h
index ca30b51..92261ca 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -25,6 +25,31 @@
 #define __JSTK_H_INCLUDED__
 
 
+
+
+/******************************************************************************
+ * debugging macro
+ *****************************************************************************/
+#ifdef DBG
+#undef DBG
+#endif
+#ifdef DEBUG
+#undef DEBUG
+#endif
+
+#define DEBUG 1
+
+#if DEBUG
+extern int      debug_level;
+#define DBG(lvl, f) {if ((lvl) <= debug_level) f;}
+#else
+#define DBG(lvl, f)
+#endif
+
+
+
+
+
 #define MAXBUTTONS 32
 #define MAXAXES MAXBUTTONS
 
@@ -62,12 +87,15 @@ typedef struct
   int          fd;             /* Actual file descriptor */
   char         *device;        /* Name of the device */
 
+  OsTimerPtr   timer;
+  Bool         timerrunning;
+  float        x,y,zx,zy;      /* Pending subpixel movements */
+
   struct AXIS
   {
-    int value;
-    int deadzone;
-    OsTimerPtr timer;
-    CARD32 lasttimer;
+    int   value;
+    int   deadzone;
+    float temp,amplify;
     enum JOYSTICKTYPE type;
     enum JOYSTICKMAPPING mapping;
   }axis[32];                   /* Configuration per axis */