diff --git a/changelog.txt b/changelog.txt
index 81e50b29..e1ed598e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -67,6 +67,7 @@ Rendering / HUD / ...
 [*] screenshotscale - in-engine scaling of screenshots.
 [*] showtargetname - turns on/off showing the player name on the HUD when in your crosshair.
 [*] Scoreboard doesn't show ping/score/pj in singleplayer
+[*] showspeed - turns speed indicator on/off
 
 Physics
 ---------------------
@@ -116,10 +117,10 @@ CubeScript
 [*] isSpect          - Determines if you are in any form of spectating (team, or singleplayer "fly")
 [*] inWater          - Determines if you are standing or submerged in water.
 [*] l0               - Adds leading zeros to an integer.
-[*] powf             - Returns a floating point integer raised to the power of another, floating point integer.
+[*] powf             - Returns a floating point number raised to the power of another floating point number.
 [*] rrnd             - Returns a ranged random integer.
 [*] storesets        - Generates an alias (list) of the current values for the given CVARs. (Useful for storing current settings into a buffer, before manipulating them with a script, with the intention of restoring them at a later time.)
-[*] strlen           - Returns the length (in characters) if the given string.
+[*] strlen           - Returns the length (in characters) of the given string.
 [*] substr           - Returns a substring from the given string.
 [*] strpos           - Returns the position of string B in string A, else -1 for not found. (Useful for parsing.)
 [*] strins           - Returns a string, instered into another string, at position x.
@@ -144,8 +145,8 @@ CubeScript
 [*] afterinit        - Native alias that is executed immediately after saved.cfg is loaded.
 [*] votepending      - Client variable that is 1 if there is a vote currently pending on the server, else 0. (e.g. echo $votepending // Example output: 0)
 [*] setfollowplayer  - Spectates the player with client number x.
+[*] rewind           - Rewinds a demo by x seconds. Forwards if x is negative.
 [*] setmr            - Seeks a demo to x minutes remaining.
-[*] rewind           - Rewinds a demo of x seconds. Forwards if x is negative.
 [*] dyngamma         - Enables or disables a new "per-official-map dynamic gamma system".
 [*] fragmessage      - Sets the frag message corresponding to a weapon. (Appears on the HUD and in your server logs.)
 [*] gibmessage       - Sets the gib message corresponding to a weapon. (Appears on the HUD and in your server logs.)
diff --git a/docs/reference.xml b/docs/reference.xml
index d3a453a3..4b53bbb7 100644
--- a/docs/reference.xml
+++ b/docs/reference.xml
@@ -218,7 +218,7 @@
 					</arguments>
 					<return token="N" description="the sum"/>
 				</command>
-				
+
 				<command name="+=">
 					<description>Adds a value to an alias.</description>
 					<remarks>
@@ -231,7 +231,7 @@
 						<argument token="B" description="value to be added"/>
 					</arguments>
 				</command>
-				
+
 				<command name="-=">
 					<description>Subtracts a value from an alias.</description>
 					<remarks>
@@ -244,7 +244,7 @@
 						<argument token="B" description="value to be subtracted"/>
 					</arguments>
 				</command>
-				
+
 				<command name="*=">
 					<description>Multiplies a value and an alias.</description>
 					<remarks>
@@ -1612,7 +1612,7 @@ echo foo
 					<remarks>
 					<remark>
 						Screenshots are saved to "screenshots/[date]_[time]_[map]_[mode].[ext]",
-						where [ext] is the image type selected.						
+						where [ext] is the image type selected.
 					</remark>
 					</remarks>
 					<defaultKeys>
@@ -4197,7 +4197,7 @@ Output:
             <remark>
               This command is useful for making complex geometry-generating scripts.
               It adds a selection to the current list of selections.
-              
+
               The dimensions of the current selections can be accessed by the commands selsx, selsy, selsxs and selsys.
               These commands return the list of coordinates corresponding to each selection.
             </remark>
@@ -4212,7 +4212,7 @@ Output:
             <identifierReference name="selsx" identifier="selsx"/>
             <identifierReference name="selsy" identifier="selsy"/>
             <identifierReference name="selsxs" identifier="selsxs"/>
-            <identifierReference name="selsys" identifier="selsys"/>            
+            <identifierReference name="selsys" identifier="selsys"/>
           </references>
           <arguments>
             <argument token="X" description="the X coordinate"/>
@@ -4866,6 +4866,11 @@ Output:
           <value token="N" description="0 off, 1 on" minValue="0" maxValue="1" defaultValue="1"/>
         </variable>
 
+        <variable name="showspeed">
+          <description>Enables or disables showing the player's horizontal speed.</description>
+          <value token="N" description="0 off, 1 on" minValue="0" maxValue="1" defaultValue="0"/>
+        </variable>
+
         <command name="disablehud">
           <description>Stores your current HUD configuration in a buffer and disables it entirely.</description>
           <references>
@@ -4881,7 +4886,7 @@ Output:
             <identifierReference identifier="disablehud"/>
           </references>
         </command>
-        
+
         <variable name="showmodedescriptions">
           <description>enables or disables the showing of game mode descriptions on the console after map starts.</description>
           <value token="B" description="0 off, 1 on" minValue="0" maxValue="1" defaultValue="1"/>
diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp
index bdd628b2..f83a8002 100644
--- a/source/src/renderhud.cpp
+++ b/source/src/renderhud.cpp
@@ -699,6 +699,8 @@ COMMANDN(getEngineState, CSgetEngineState, ARG_NONE);
 VARP(clockdisplay,0,0,2);
 VARP(dbgpos,0,0,1);
 VARP(showtargetname,0,1,1);
+VARP(showspeed, 0, 0, 1);
+
 void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwater)
 {
     playerent *p = camera1->type<ENT_CAMERA ? (playerent *)camera1 : player1;
@@ -927,6 +929,15 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
     const int tbMSGtop = (VIRTH*3/2)*7/8;
     draw_textf("!TEST BUILD!", tbMSGleft, tbMSGtop);
     / * */
+
+    if(showspeed)
+    {
+        glPushMatrix();
+        glScalef(2, 2, 1);
+        draw_textf("v %.2f", VIRTW/2, VIRTH*0.85f, sqrtf(p->vel.x*p->vel.x + p->vel.y*p->vel.y));
+        glPopMatrix();
+    }
+
     drawscores();
     if(!hidespecthud && spectating && player1->spectatemode!=SM_DEATHCAM)
     {