diff --git a/ChangeLog b/ChangeLog
index 988146db7..b71b7a526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* src/acl.erl (match_acl/3): Use string() version of
 	User/Server/Resource to match an ACL.
 
+	* src/cyrsasl.erl: Return invalid-mechanism when a mechanism isn't
+	supported instead of no-mechanism, which wasn't standard-compliant.
+
 2009-01-19  Pablo Polvorin  <pablo.polvorin@process-one.net>
 
 	* src/cyrsasl_digest.erl: Typo (prolists -> proplists).
diff --git a/src/cyrsasl.erl b/src/cyrsasl.erl
index 9dedd0b75..e742cee17 100644
--- a/src/cyrsasl.erl
+++ b/src/cyrsasl.erl
@@ -133,10 +133,10 @@ server_start(State, Mech, ClientIn) ->
 						 mech_state = MechState},
 				ClientIn);
 		_ ->
-		    {error, 'no-mechanism'}
+		    {error, 'invalid-mechanism'}
 	    end;
 	false ->
-	    {error, 'no-mechanism'}
+	    {error, 'invalid-mechanism'}
     end.
 
 server_step(State, ClientIn) ->