diff --git a/CHANGES b/CHANGES
index 43a0ffcfb7fa2e8b210c8ec6b18660055f690864..9104c1fc7b5aae8d6063f70c49feb4617be51887 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2111,6 +2111,13 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
  Changes between 0.9.6g and 0.9.6h  [xx XXX xxxx]
 
+  *) Bugfix: client side session caching did not work with external caching,
+     because the session->cipher setting was not restored when reloading
+     from the external cache. This problem was masked, when
+     SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG (part of SSL_OP_ALL) was set.
+     (Found by Steve Haslam <steve@araqnid.ddts.net>.)
+     [Lutz Jaenicke]
+
   *) Fix client_certificate (ssl/s2_clnt.c): The permissible total
      length of the REQUEST-CERTIFICATE message is 18 .. 34, not 17 .. 33.
      [Zeev Lieber <zeev-l@yahoo.com>]
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index bc7523cdf143864f15756ff5e062f81e0d432d92..45bea069f2f79590a26ff11360ae3db6a0c5a795 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -722,6 +722,11 @@ static int ssl3_get_server_hello(SSL *s)
 		goto f_err;
 		}
 
+	/* Depending on the session caching (internal/external), the cipher
+	   and/or cipher_id values may not be set. Make sure that
+	   cipher_id is set and use it for comparison. */
+	if (s->session->cipher)
+		s->session->cipher_id = s->session->cipher->id;
 	if (s->hit && (s->session->cipher_id != c->id))
 		{
 		if (!(s->options &