diff --git a/CHANGES b/CHANGES
index bf4457be7a966f29a22fa9bdd3ae35b581299358..7dbede58f6a97f9f949b499263f95dbe9d0c3f52 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,10 @@
          *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
          +) applies to 0.9.7 only
 
+  *) Bugfix: Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c)
+     if the SSL_R_LENGTH_MISMATCH error is detected.
+     [Geoff Thorpe, Bodo Moeller]
+
   +) New experimental application configuration code.
      [Steve Henson]
 
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 27bc16eb6bb5a040d0260eb86553944fe2688023..736b6f233e74b86ba43a6b089068b46624d67390 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1338,6 +1338,7 @@ static int ssl3_get_server_done(SSL *s)
 		/* should contain no data */
 		ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
 		SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
+		return -1;
 		}
 	ret=1;
 	return(ret);