diff --git a/Linux/sgml/Quakespasm.sgml b/Linux/sgml/Quakespasm.sgml
index de9198de..9558079f 100644
--- a/Linux/sgml/Quakespasm.sgml
+++ b/Linux/sgml/Quakespasm.sgml
@@ -3,7 +3,7 @@
 <title>QuakeSpasm
 <toc>
 
-<em>Page last edited: October 2022.</em>
+<em>Page last edited: March 2023.</em>
 
 <sect>About<p>
 
@@ -24,7 +24,6 @@ but no CD-ROM support.
 <item><url url="https://github.com/sezero/quakespasm" name="Github mirror.">
 </itemize>
 
-
 <sect>Hints<p>
 <em>Visit the <url url="https://celephais.net/fitzquake/" name="FitzQuake homepage"> for a full run-down of the engine's commands and variables.</em>
 <itemize>
@@ -64,17 +63,17 @@ If your controller doesn't work you can try placing <url url="https://raw.github
 
 <sect2>Cvars<p>
 <itemize>
-<item>joy_deadzone_look - Fraction of the look stick travel to be deadzone, between 0 and 1. Default 0.175.
-<item>joy_deadzone_move - Same as above, for the move stick. Default 0.175.
+<item>joy_deadzone_look - Fraction of look stick travel to be deadzone, between 0 and 1. Default is 0.175.
+<item>joy_deadzone_move - Same as above, but for the move stick. Default is 0.175.
 <item>joy_deadzone_trigger - Fraction of trigger range required to register a button press on the analog triggers, between 0 and 1. Default 0.2.
 <item>joy_outer_threshold_look - Outer deadzone for the look stick, between 0 and 1. Default 0.02.
 <item>joy_outer_threshold_move - Outer deadzone for the move stick, between 0 and 1. Default 0.02.
 <item>joy_sensitivity_yaw/pitch - Max angular speed in degrees/second when looking. Defaults are 240 for yaw (turning left/right) and 130 for pitch (up/down).
 <item>joy_exponent - For the look stick, the stick displacement (between 0 and 1) is raised to this power. Default is 2. A value of 1 would give a linear relationship between stick displacement and fraction of the maximum angular speed.
-<item>joy_exponent_move - Same as joy_exponent but for the move stick. Default 2.
+<item>joy_exponent_move - Same as joy_exponent but for the move stick. Default is 2.
 <item>joy_invert - Set to 1 to invert the vertical axis of the look stick.
-<item>joy_swapmovelook - Set to 1 to swap the left and right analog stick functions. Default 0, move on the left stick, look on the right stick.
-<item>joy_enable - Set to 0 to disable controller support. Default 1.
+<item>joy_swapmovelook - Set to 1 to swap the left and right analog stick functions. Default is 0, move on the left stick, look on the right stick.
+<item>joy_enable - Set to 0 to disable controller support. Default is 1.
 </itemize>
 
 <sect2>Buttons<p>
@@ -140,9 +139,13 @@ QuakeSpasm 0.94 has support for playing the 2021 re-release content: Copy the qu
 
 <sect>Changes<p>
 
-<sect1>Changes in master<p>
+<sect1>Changes in 0.96.0<p>
 <itemize>
-<item> <url url="https://github.com/sezero/quakespasm/pull/51" name="Adjustments"> to joystick defaults, behaviour (patch by Macil).
+<item> <url url="https://github.com/sezero/quakespasm/pull/51" name="Adjustments"> to joystick defaults, behaviour (patch by Chris Cowan). See the "Controller support / Cvars" section above.
+<item> Fix for a mouse grabbing issue on macOS.
+<item> Add missing support for <em>-ip</em> command line option on unix / macOS.
+<item> Minor code cleanups. Updated third party code, e.g. SDL, music codecs, etc.
+<item> Thanks to Andrei Drexler, Chris Cowan and Maciej Olędzki for their patches.
 </itemize>
 </p>
 
diff --git a/MacOSX/English.lproj/InfoPlist.strings b/MacOSX/English.lproj/InfoPlist.strings
index 41951b27..3c14a9e5 100644
Binary files a/MacOSX/English.lproj/InfoPlist.strings and b/MacOSX/English.lproj/InfoPlist.strings differ
diff --git a/MacOSX/Info.plist b/MacOSX/Info.plist
index d1314234..ba03160c 100644
--- a/MacOSX/Info.plist
+++ b/MacOSX/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.95.1</string>
+	<string>0.96.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSApplicationCategoryType</key>
diff --git a/Quake/quakedef.h b/Quake/quakedef.h
index eea4230b..5a298677 100644
--- a/Quake/quakedef.h
+++ b/Quake/quakedef.h
@@ -36,8 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define	X11_VERSION		1.10
 
 #define	FITZQUAKE_VERSION	0.85	//johnfitz
-#define	QUAKESPASM_VERSION	0.95
-#define	QUAKESPASM_VER_PATCH	1	// helper to print a string like 0.94.7
+#define	QUAKESPASM_VERSION	0.96
+#define	QUAKESPASM_VER_PATCH	0	// helper to print a string like 0.94.7
 #ifndef	QUAKESPASM_VER_SUFFIX
 #define	QUAKESPASM_VER_SUFFIX		// optional version suffix string literal like "-beta1"
 #endif
diff --git a/Quakespasm.html b/Quakespasm.html
index e3557576..4f306dbf 100644
--- a/Quakespasm.html
+++ b/Quakespasm.html
@@ -8,7 +8,7 @@
 <H1>QuakeSpasm</H1>
 
 <H2></H2>
-<P><EM>Page last edited: October 2022.</EM></P>
+<P><EM>Page last edited: March 2023.</EM></P>
 
 <P>
 <H2><A NAME="toc1">1.</A> <A HREF="Quakespasm.html#s1">About</A></H2>
@@ -31,33 +31,34 @@
 <P>
 <H2><A NAME="toc5">5.</A> <A HREF="Quakespasm.html#s5">Changes</A></H2>
 <UL>
-<LI><A NAME="toc5.1">5.1</A> <A HREF="Quakespasm.html#ss5.1">Changes in 0.95.1</A>
-<LI><A NAME="toc5.2">5.2</A> <A HREF="Quakespasm.html#ss5.2">Changes in 0.95.0</A>
-<LI><A NAME="toc5.3">5.3</A> <A HREF="Quakespasm.html#ss5.3">Changes in 0.94.7</A>
-<LI><A NAME="toc5.4">5.4</A> <A HREF="Quakespasm.html#ss5.4">Changes in 0.94.6</A>
-<LI><A NAME="toc5.5">5.5</A> <A HREF="Quakespasm.html#ss5.5">Changes in 0.94.5</A>
-<LI><A NAME="toc5.6">5.6</A> <A HREF="Quakespasm.html#ss5.6">Changes in 0.94.4</A>
-<LI><A NAME="toc5.7">5.7</A> <A HREF="Quakespasm.html#ss5.7">Changes in 0.94.3</A>
-<LI><A NAME="toc5.8">5.8</A> <A HREF="Quakespasm.html#ss5.8">Changes in 0.94.2</A>
-<LI><A NAME="toc5.9">5.9</A> <A HREF="Quakespasm.html#ss5.9">Changes in 0.94.1</A>
-<LI><A NAME="toc5.10">5.10</A> <A HREF="Quakespasm.html#ss5.10">Changes in 0.94.0</A>
-<LI><A NAME="toc5.11">5.11</A> <A HREF="Quakespasm.html#ss5.11">Changes in 0.93.2</A>
-<LI><A NAME="toc5.12">5.12</A> <A HREF="Quakespasm.html#ss5.12">Changes in 0.93.1</A>
-<LI><A NAME="toc5.13">5.13</A> <A HREF="Quakespasm.html#ss5.13">Changes in 0.93.0</A>
-<LI><A NAME="toc5.14">5.14</A> <A HREF="Quakespasm.html#ss5.14">Changes in 0.92.1</A>
-<LI><A NAME="toc5.15">5.15</A> <A HREF="Quakespasm.html#ss5.15">Changes in 0.92.0</A>
-<LI><A NAME="toc5.16">5.16</A> <A HREF="Quakespasm.html#ss5.16">Changes in 0.91.0</A>
-<LI><A NAME="toc5.17">5.17</A> <A HREF="Quakespasm.html#ss5.17">Changes in 0.90.1</A>
-<LI><A NAME="toc5.18">5.18</A> <A HREF="Quakespasm.html#ss5.18">Changes in 0.90.0</A>
-<LI><A NAME="toc5.19">5.19</A> <A HREF="Quakespasm.html#ss5.19">Changes in 0.85.9</A>
-<LI><A NAME="toc5.20">5.20</A> <A HREF="Quakespasm.html#ss5.20">Changes in 0.85.8</A>
-<LI><A NAME="toc5.21">5.21</A> <A HREF="Quakespasm.html#ss5.21">Changes in 0.85.7</A>
-<LI><A NAME="toc5.22">5.22</A> <A HREF="Quakespasm.html#ss5.22">Changes in 0.85.6</A>
-<LI><A NAME="toc5.23">5.23</A> <A HREF="Quakespasm.html#ss5.23">Changes in 0.85.5</A>
-<LI><A NAME="toc5.24">5.24</A> <A HREF="Quakespasm.html#ss5.24">Changes in 0.85.4</A>
-<LI><A NAME="toc5.25">5.25</A> <A HREF="Quakespasm.html#ss5.25">Changes in 0.85.3</A>
-<LI><A NAME="toc5.26">5.26</A> <A HREF="Quakespasm.html#ss5.26">Changes in 0.85.2</A>
-<LI><A NAME="toc5.27">5.27</A> <A HREF="Quakespasm.html#ss5.27">Changes in 0.85.1</A>
+<LI><A NAME="toc5.1">5.1</A> <A HREF="Quakespasm.html#ss5.1">Changes in 0.96.0</A>
+<LI><A NAME="toc5.2">5.2</A> <A HREF="Quakespasm.html#ss5.2">Changes in 0.95.1</A>
+<LI><A NAME="toc5.3">5.3</A> <A HREF="Quakespasm.html#ss5.3">Changes in 0.95.0</A>
+<LI><A NAME="toc5.4">5.4</A> <A HREF="Quakespasm.html#ss5.4">Changes in 0.94.7</A>
+<LI><A NAME="toc5.5">5.5</A> <A HREF="Quakespasm.html#ss5.5">Changes in 0.94.6</A>
+<LI><A NAME="toc5.6">5.6</A> <A HREF="Quakespasm.html#ss5.6">Changes in 0.94.5</A>
+<LI><A NAME="toc5.7">5.7</A> <A HREF="Quakespasm.html#ss5.7">Changes in 0.94.4</A>
+<LI><A NAME="toc5.8">5.8</A> <A HREF="Quakespasm.html#ss5.8">Changes in 0.94.3</A>
+<LI><A NAME="toc5.9">5.9</A> <A HREF="Quakespasm.html#ss5.9">Changes in 0.94.2</A>
+<LI><A NAME="toc5.10">5.10</A> <A HREF="Quakespasm.html#ss5.10">Changes in 0.94.1</A>
+<LI><A NAME="toc5.11">5.11</A> <A HREF="Quakespasm.html#ss5.11">Changes in 0.94.0</A>
+<LI><A NAME="toc5.12">5.12</A> <A HREF="Quakespasm.html#ss5.12">Changes in 0.93.2</A>
+<LI><A NAME="toc5.13">5.13</A> <A HREF="Quakespasm.html#ss5.13">Changes in 0.93.1</A>
+<LI><A NAME="toc5.14">5.14</A> <A HREF="Quakespasm.html#ss5.14">Changes in 0.93.0</A>
+<LI><A NAME="toc5.15">5.15</A> <A HREF="Quakespasm.html#ss5.15">Changes in 0.92.1</A>
+<LI><A NAME="toc5.16">5.16</A> <A HREF="Quakespasm.html#ss5.16">Changes in 0.92.0</A>
+<LI><A NAME="toc5.17">5.17</A> <A HREF="Quakespasm.html#ss5.17">Changes in 0.91.0</A>
+<LI><A NAME="toc5.18">5.18</A> <A HREF="Quakespasm.html#ss5.18">Changes in 0.90.1</A>
+<LI><A NAME="toc5.19">5.19</A> <A HREF="Quakespasm.html#ss5.19">Changes in 0.90.0</A>
+<LI><A NAME="toc5.20">5.20</A> <A HREF="Quakespasm.html#ss5.20">Changes in 0.85.9</A>
+<LI><A NAME="toc5.21">5.21</A> <A HREF="Quakespasm.html#ss5.21">Changes in 0.85.8</A>
+<LI><A NAME="toc5.22">5.22</A> <A HREF="Quakespasm.html#ss5.22">Changes in 0.85.7</A>
+<LI><A NAME="toc5.23">5.23</A> <A HREF="Quakespasm.html#ss5.23">Changes in 0.85.6</A>
+<LI><A NAME="toc5.24">5.24</A> <A HREF="Quakespasm.html#ss5.24">Changes in 0.85.5</A>
+<LI><A NAME="toc5.25">5.25</A> <A HREF="Quakespasm.html#ss5.25">Changes in 0.85.4</A>
+<LI><A NAME="toc5.26">5.26</A> <A HREF="Quakespasm.html#ss5.26">Changes in 0.85.3</A>
+<LI><A NAME="toc5.27">5.27</A> <A HREF="Quakespasm.html#ss5.27">Changes in 0.85.2</A>
+<LI><A NAME="toc5.28">5.28</A> <A HREF="Quakespasm.html#ss5.28">Changes in 0.85.1</A>
 </UL>
 <P>
 <H2><A NAME="toc6">6.</A> <A HREF="Quakespasm.html#s6">Copyright</A></H2>
@@ -129,13 +130,17 @@ where DRIVER may be alsa, dsp, pulse, esd ...</LI>
 <H3>Cvars</H3>
 <P>
 <UL>
-<LI>joy_deadzone - Fraction of the stick travel to be deadzone, between 0 and 1. Default 0.175.</LI>
+<LI>joy_deadzone_look - Fraction of look stick travel to be deadzone, between 0 and 1. Default is 0.175.</LI>
+<LI>joy_deadzone_move - Same as above, but for the move stick. Default is 0.175.</LI>
 <LI>joy_deadzone_trigger - Fraction of trigger range required to register a button press on the analog triggers, between 0 and 1. Default 0.2.</LI>
-<LI>joy_sensitivity_yaw/pitch - Max angular speed in degrees/second when looking. Defaults are 300 for yaw (turning left/right) and 150 for pitch (up/down).</LI>
-<LI>joy_exponent - For the look stick, the stick displacement (between 0 and 1) is raised to this power. Default is 3. A value of 1 would give a linear relationship between stick displacement and fraction of the maximum angular speed.</LI>
+<LI>joy_outer_threshold_look - Outer deadzone for the look stick, between 0 and 1. Default 0.02.</LI>
+<LI>joy_outer_threshold_move - Outer deadzone for the move stick, between 0 and 1. Default 0.02.</LI>
+<LI>joy_sensitivity_yaw/pitch - Max angular speed in degrees/second when looking. Defaults are 240 for yaw (turning left/right) and 130 for pitch (up/down).</LI>
+<LI>joy_exponent - For the look stick, the stick displacement (between 0 and 1) is raised to this power. Default is 2. A value of 1 would give a linear relationship between stick displacement and fraction of the maximum angular speed.</LI>
+<LI>joy_exponent_move - Same as joy_exponent but for the move stick. Default is 2.</LI>
 <LI>joy_invert - Set to 1 to invert the vertical axis of the look stick.</LI>
-<LI>joy_swapmovelook - Set to 1 to swap the left and right analog stick functions. Default 0, move on the left stick, look on the right stick.</LI>
-<LI>joy_enable - Set to 0 to disable controller support. Default 1.</LI>
+<LI>joy_swapmovelook - Set to 1 to swap the left and right analog stick functions. Default is 0, move on the left stick, look on the right stick.</LI>
+<LI>joy_enable - Set to 0 to disable controller support. Default is 1.</LI>
 </UL>
 </P>
 <H3>Buttons</H3>
@@ -206,7 +211,20 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 
 <H2><A NAME="s5">5.</A> <A HREF="#toc5">Changes</A></H2>
 
-<H2><A NAME="ss5.1">5.1</A> <A HREF="#toc5.1">Changes in 0.95.1</A>
+<H2><A NAME="ss5.1">5.1</A> <A HREF="#toc5.1">Changes in 0.96.0</A>
+</H2>
+
+<P>
+<UL>
+<LI> <A HREF="https://github.com/sezero/quakespasm/pull/51">Adjustments</A> to joystick defaults, behaviour (patch by Chris Cowan). See the <A HREF="Quakespasm.html#ss3.2">"Controller support / Cvars"</A> section above.</LI>
+<LI> Fix for a mouse grabbing issue on macOS.</LI>
+<LI> Add missing support for <EM>-ip</EM> command line option on unix / macOS.</LI>
+<LI> Minor code cleanups. Updated third party code, e.g. SDL, music codecs, etc.</LI>
+<LI> Thanks to Andrei Drexler, Chris Cowan and Maciej Olędzki for their patches.</LI>
+</UL>
+</P>
+
+<H2><A NAME="ss5.2">5.2</A> <A HREF="#toc5.2">Changes in 0.95.1</A>
 </H2>
 <P>
 <UL>
@@ -220,7 +238,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.2">5.2</A> <A HREF="#toc5.2">Changes in 0.95.0</A>
+<H2><A NAME="ss5.3">5.3</A> <A HREF="#toc5.3">Changes in 0.95.0</A>
 </H2>
 <P>
 <UL>
@@ -233,7 +251,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.3">5.3</A> <A HREF="#toc5.3">Changes in 0.94.7</A>
+<H2><A NAME="ss5.4">5.4</A> <A HREF="#toc5.4">Changes in 0.94.7</A>
 </H2>
 <P>
 <UL>
@@ -244,7 +262,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.4">5.4</A> <A HREF="#toc5.4">Changes in 0.94.6</A>
+<H2><A NAME="ss5.5">5.5</A> <A HREF="#toc5.5">Changes in 0.94.6</A>
 </H2>
 <P>
 <UL>
@@ -257,7 +275,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.5">5.5</A> <A HREF="#toc5.5">Changes in 0.94.5</A>
+<H2><A NAME="ss5.6">5.6</A> <A HREF="#toc5.6">Changes in 0.94.5</A>
 </H2>
 <P>
 <UL>
@@ -270,7 +288,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.6">5.6</A> <A HREF="#toc5.6">Changes in 0.94.4</A>
+<H2><A NAME="ss5.7">5.7</A> <A HREF="#toc5.7">Changes in 0.94.4</A>
 </H2>
 <P>
 <UL>
@@ -292,7 +310,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.7">5.7</A> <A HREF="#toc5.7">Changes in 0.94.3</A>
+<H2><A NAME="ss5.8">5.8</A> <A HREF="#toc5.8">Changes in 0.94.3</A>
 </H2>
 <P>
 <UL>
@@ -302,7 +320,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.8">5.8</A> <A HREF="#toc5.8">Changes in 0.94.2</A>
+<H2><A NAME="ss5.9">5.9</A> <A HREF="#toc5.9">Changes in 0.94.2</A>
 </H2>
 <P>
 <UL>
@@ -313,7 +331,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.9">5.9</A> <A HREF="#toc5.9">Changes in 0.94.1</A>
+<H2><A NAME="ss5.10">5.10</A> <A HREF="#toc5.10">Changes in 0.94.1</A>
 </H2>
 <P>
 <UL>
@@ -321,7 +339,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.10">5.10</A> <A HREF="#toc5.10">Changes in 0.94.0</A>
+<H2><A NAME="ss5.11">5.11</A> <A HREF="#toc5.11">Changes in 0.94.0</A>
 </H2>
 <P>
 <UL>
@@ -346,7 +364,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.11">5.11</A> <A HREF="#toc5.11">Changes in 0.93.2</A>
+<H2><A NAME="ss5.12">5.12</A> <A HREF="#toc5.12">Changes in 0.93.2</A>
 </H2>
 <P>
 <UL>
@@ -359,7 +377,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.12">5.12</A> <A HREF="#toc5.12">Changes in 0.93.1</A>
+<H2><A NAME="ss5.13">5.13</A> <A HREF="#toc5.13">Changes in 0.93.1</A>
 </H2>
 <P>
 <UL>
@@ -373,7 +391,7 @@ Alternatively, have a look at <B>Makefile.darwin</B> for more instructions on bu
 </UL>
 </P>
 
-<H2><A NAME="ss5.13">5.13</A> <A HREF="#toc5.13">Changes in 0.93.0</A>
+<H2><A NAME="ss5.14">5.14</A> <A HREF="#toc5.14">Changes in 0.93.0</A>
 </H2>
 <P>
 <UL>
@@ -416,7 +434,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.14">5.14</A> <A HREF="#toc5.14">Changes in 0.92.1</A>
+<H2><A NAME="ss5.15">5.15</A> <A HREF="#toc5.15">Changes in 0.92.1</A>
 </H2>
 <P>
 <UL>
@@ -426,7 +444,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.15">5.15</A> <A HREF="#toc5.15">Changes in 0.92.0</A>
+<H2><A NAME="ss5.16">5.16</A> <A HREF="#toc5.16">Changes in 0.92.0</A>
 </H2>
 <P>
 <UL>
@@ -446,7 +464,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.16">5.16</A> <A HREF="#toc5.16">Changes in 0.91.0</A>
+<H2><A NAME="ss5.17">5.17</A> <A HREF="#toc5.17">Changes in 0.91.0</A>
 </H2>
 <H3>Bugfixes</H3>
 <P>
@@ -496,7 +514,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.17">5.17</A> <A HREF="#toc5.17">Changes in 0.90.1</A>
+<H2><A NAME="ss5.18">5.18</A> <A HREF="#toc5.18">Changes in 0.90.1</A>
 </H2>
 <H3>Bugfixes</H3>
 <P>
@@ -546,7 +564,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.18">5.18</A> <A HREF="#toc5.18">Changes in 0.90.0</A>
+<H2><A NAME="ss5.19">5.19</A> <A HREF="#toc5.19">Changes in 0.90.0</A>
 </H2>
 <P>
 <UL>
@@ -592,7 +610,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.19">5.19</A> <A HREF="#toc5.19">Changes in 0.85.9</A>
+<H2><A NAME="ss5.20">5.20</A> <A HREF="#toc5.20">Changes in 0.85.9</A>
 </H2>
 <P>
 <UL>
@@ -616,7 +634,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.20">5.20</A> <A HREF="#toc5.20">Changes in 0.85.8</A>
+<H2><A NAME="ss5.21">5.21</A> <A HREF="#toc5.21">Changes in 0.85.8</A>
 </H2>
 <P>
 <UL>
@@ -641,7 +659,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.21">5.21</A> <A HREF="#toc5.21">Changes in 0.85.7</A>
+<H2><A NAME="ss5.22">5.22</A> <A HREF="#toc5.22">Changes in 0.85.7</A>
 </H2>
 <P>
 <UL>
@@ -659,7 +677,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.22">5.22</A> <A HREF="#toc5.22">Changes in 0.85.6</A>
+<H2><A NAME="ss5.23">5.23</A> <A HREF="#toc5.23">Changes in 0.85.6</A>
 </H2>
 <P>
 <UL>
@@ -670,7 +688,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.23">5.23</A> <A HREF="#toc5.23">Changes in 0.85.5</A>
+<H2><A NAME="ss5.24">5.24</A> <A HREF="#toc5.24">Changes in 0.85.5</A>
 </H2>
 <P>
 <UL>
@@ -689,7 +707,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.24">5.24</A> <A HREF="#toc5.24">Changes in 0.85.4</A>
+<H2><A NAME="ss5.25">5.25</A> <A HREF="#toc5.25">Changes in 0.85.4</A>
 </H2>
 <P>
 <UL>
@@ -707,7 +725,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.25">5.25</A> <A HREF="#toc5.25">Changes in 0.85.3</A>
+<H2><A NAME="ss5.26">5.26</A> <A HREF="#toc5.26">Changes in 0.85.3</A>
 </H2>
 <P>
 <UL>
@@ -729,7 +747,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.26">5.26</A> <A HREF="#toc5.26">Changes in 0.85.2</A>
+<H2><A NAME="ss5.27">5.27</A> <A HREF="#toc5.27">Changes in 0.85.2</A>
 </H2>
 <P>
 <UL>
@@ -746,7 +764,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
 </UL>
 </P>
 
-<H2><A NAME="ss5.27">5.27</A> <A HREF="#toc5.27">Changes in 0.85.1</A>
+<H2><A NAME="ss5.28">5.28</A> <A HREF="#toc5.28">Changes in 0.85.1</A>
 </H2>
 <P>
 <UL>
diff --git a/Quakespasm.txt b/Quakespasm.txt
index 9d00c4fb..acae2a52 100644
--- a/Quakespasm.txt
+++ b/Quakespasm.txt
@@ -3,7 +3,7 @@
   ______________________________________________________________________
 
 
-  Page last edited: October 2022.
+  Page last edited: March 2023.
 
 
   1. About
@@ -98,30 +98,42 @@
 
   Controller Support - Cvars:
 
-  -  joy_deadzone - Fraction of the stick travel to be deadzone, between
-     0 and 1. Default 0.175.
+  -  joy_deadzone_look - Fraction of look stick travel to be deadzone,
+     between 0 and 1. Default is 0.175.
+
+  -  joy_deadzone_move - Same as above, but for the move stick. Default
+     is 0.175.
 
   -  joy_deadzone_trigger - Fraction of trigger range required to
      register a button press on the analog triggers, between 0 and 1.
      Default 0.2.
 
+  -  joy_outer_threshold_look - Outer deadzone for the look stick,
+     between 0 and 1. Default 0.02.
+
+  -  joy_outer_threshold_move - Outer deadzone for the move stick,
+     between 0 and 1. Default 0.02.
+
   -  joy_sensitivity_yaw/pitch - Max angular speed in degrees/second
-     when looking. Defaults are 300 for yaw (turning left/right) and 150
+     when looking. Defaults are 240 for yaw (turning left/right) and 130
      for pitch (up/down).
 
   -  joy_exponent - For the look stick, the stick displacement (between
-     0 and 1) is raised to this power. Default is 3. A value of 1 would
+     0 and 1) is raised to this power. Default is 2. A value of 1 would
      give a linear relationship between stick displacement and fraction
      of the maximum angular speed.
 
+  -  joy_exponent_move - Same as joy_exponent but for the move stick.
+     Default is 2.
+
   -  joy_invert - Set to 1 to invert the vertical axis of the look
      stick.
 
   -  joy_swapmovelook - Set to 1 to swap the left and right analog stick
-     functions. Default 0, move on the left stick, look on the right
+     functions. Default is 0, move on the left stick, look on the right
      stick.
 
-  -  joy_enable - Set to 0 to disable controller support. Default 1.
+  -  joy_enable - Set to 0 to disable controller support. Default is 1.
 
   Controller Support - Buttons:
 
@@ -209,6 +221,22 @@
 
   5. Changes
 
+  Changes in 0.96.0:
+
+  -  Adjustments to joystick defaults, behaviour (patch by Chris Cowan).
+     See the "Controller support / Cvars" section above.
+
+  -  Fix for a mouse grabbing issue on macOS.
+
+  -  Add missing support for -ip command line option on unix / macOS.
+
+  -  Minor code cleanups. Updated third party code, e.g. SDL, music
+     codecs, etc.
+
+  -  Thanks to Andrei Drexler, Chris Cowan and Maciej Olędzki for their
+     patches.
+
+
   Changes in 0.95.1:
 
   -  Allow mixing lit and unlit textures in the same map.