diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 29fe04083f..dd1572b53b 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -5,9 +5,13 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
 ================================================================================
-StepMania 5.0 Preview 3 | 2011081?
+StepMania 5.0 Preview 3 | 20110820
 --------------------------------------------------------------------------------
 
+2011/08/20
+----------
+* [CustomSpeedMods] Updated to v2.2; implements a m-Mod fix. [hanubeki]
+
 2011/08/19
 ----------
 * [Steps] Add PredictMeter() and GetDisplayBPMType() Lua bindings. [AJ]
diff --git a/Themes/_fallback/Scripts/03 CustomSpeedMods.lua b/Themes/_fallback/Scripts/03 CustomSpeedMods.lua
index 4886712686..f30731f305 100644
--- a/Themes/_fallback/Scripts/03 CustomSpeedMods.lua	
+++ b/Themes/_fallback/Scripts/03 CustomSpeedMods.lua	
@@ -1,9 +1,12 @@
 --[[
-Custom Speed Mods v2.1 (for StepMania 5)
+Custom Speed Mods v2.2 (for StepMania 5)
 by AJ Kelly of KKI Labs ( http://kki.ajworld.net/ )
 
 changelog:
 
+v2.2 (StepMania 5 Preview 3)
+* m-Mod bugfix from hanubeki.
+
 v2.1 (StepMania 5 Preview 2)
 * Added support for m-Mods.
 
@@ -267,8 +270,18 @@ function SpeedMods()
 
 		LoadSelections = function(self, list, pn)
 			local pMods = GAMESTATE:GetPlayerState(pn):GetPlayerOptionsString("ModsLevel_Preferred")
+
+			local isMMod = string.match(join(',',pMods), "m%d+")
+			if isMMod then
+				local mIndex = table.find(self.Choices, isMMod)
+				if mIndex then
+					list[mIndex] = true
+					return
+				end
+			end
+
 			for i = 1,table.getn(self.Choices) do
-				if string.find(pMods, self.Choices[i]) then
+				if table.find(pMods, self.Choices[i]) then
 					list[i] = true
 					return
 				end