diff --git a/README.md b/README.md
index 4b842cc..6e963ea 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick
 
diff --git a/man/joystick.man b/man/joystick.man
index e71a122..19c2ae3 100644
--- a/man/joystick.man
+++ b/man/joystick.man
@@ -380,7 +380,7 @@ You might also want to set the device "floating" to stop it from reporting core
 .SH "NOTES"
 It is not recommended to enable the
 .B joystick
-input driver by default unless explicitely requested by the user.
+input driver by default unless explicitly requested by the user.
 
 Configuration through
 .I InputClass
diff --git a/src/backend_bsd.c b/src/backend_bsd.c
index 302b057..248cde3 100644
--- a/src/backend_bsd.c
+++ b/src/backend_bsd.c
@@ -230,7 +230,7 @@ jstkCloseDevice_bsd(JoystickDevPtr joystick)
  *
  * Reads data from fd and stores it in the JoystickDevRec struct
  * fills in the type of event and the number of the button/axis
- * return 1 if success, 0 otherwise. Success does not neccessarily
+ * return 1 if success, 0 otherwise. Success does not necessarily
  * mean that there is a new event waiting.
  *
  ***********************************************************************
diff --git a/src/backend_evdev.c b/src/backend_evdev.c
index cae4b28..5fa75fb 100644
--- a/src/backend_evdev.c
+++ b/src/backend_evdev.c
@@ -226,7 +226,7 @@ jstkCloseDevice_evdev(JoystickDevPtr joystick)
  *
  * Reads data from fd and stores it in the JoystickDevRec struct
  * fills in the type of event and the number of the button/axis
- * return 1 if success, 0 otherwise. Success does not neccessarily
+ * return 1 if success, 0 otherwise. Success does not necessarily
  * mean that there is a new event waiting.
  *
  ***********************************************************************
diff --git a/src/backend_joystick.c b/src/backend_joystick.c
index 172ce50..b642816 100644
--- a/src/backend_joystick.c
+++ b/src/backend_joystick.c
@@ -139,7 +139,7 @@ jstkOpenDevice_joystick(JoystickDevPtr joystick, Bool probe)
  *
  * Reads data from fd and stores it in the JoystickDevRec struct
  * fills in the type of event and the number of the button/axis
- * return 1 if success, 0 otherwise. Success does not neccessarily
+ * return 1 if success, 0 otherwise. Success does not necessarily
  * mean that there is a new event waiting.
  *
  ***********************************************************************
diff --git a/src/jstk.h b/src/jstk.h
index 6421e7f..087389e 100644
--- a/src/jstk.h
+++ b/src/jstk.h
@@ -107,7 +107,7 @@ typedef struct _JoystickDevRec {
     jstkOpenDeviceProc open_proc; /* Call for re-open backend */
     jstkCloseDeviceProc close_proc; /* Callback for closing the backend */
     jstkReadDataProc read_proc; /* Callback for reading data from the backend */
-    void         *devicedata; /* Extra platform device dependend data */
+    void         *devicedata; /* Extra platform device dependent data */
     char         *device;     /* Name of the device */
     InputInfoPtr joystick_device; /* Back pointer to the joystick device */
     InputInfoPtr keyboard_device; /* Slave device for keyboard events */
diff --git a/src/jstk_axis.c b/src/jstk_axis.c
index cb4a004..3f3da6c 100644
--- a/src/jstk_axis.c
+++ b/src/jstk_axis.c
@@ -125,7 +125,7 @@ jstkAxisTimer(OsTimerPtr        timer,
 	     *
 	     *   a >>= 1.414 
 	     *
-	     * the following formula achieves results inbetween,
+	     * the following formula achieves results in between,
 	     * so it should feel natural on both devices while maintaining a
 	     * nice acceleration:
 	     * 
diff --git a/src/jstk_options.c b/src/jstk_options.c
index 65f25f8..fa101fe 100644
--- a/src/jstk_options.c
+++ b/src/jstk_options.c
@@ -78,7 +78,7 @@ jstkGetAxisMapping(float *value, const char* param, const char* name)
  *
  * jstkParseButtonOption --
  *
- * Interpretes one ButtonMappingX option, given in 'org'
+ * Interprets one ButtonMappingX option, given in 'org'
  * stores the result in *button
  * name is the name of the InputDevice
  *
@@ -163,7 +163,7 @@ jstkParseButtonOption(const char* org,
  *
  * jstkParseAxisOption --
  *
- * Interpretes one AxisMappingX option, given in 'org'
+ * Interprets one AxisMappingX option, given in 'org'
  * stores the result in *axis
  * name is the name of the InputDevice
  *