diff --git a/CHANGES b/CHANGES
index 09fa00d65..eb0867ba3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 1.0.0e and 1.0.0f [xx XXX xxxx]
 
+  *) Fix ssl_ciph.c set-up race.
+     [Adam Langley (Google)]
+
   *) Fix spurious failures in ecdsatest.c.
      [Emilia Käsper (Google)]
 
@@ -931,6 +934,9 @@
   
  Changes between 0.9.8r and 0.9.8s [xx XXX xxxx]
 
+  *) Fix ssl_ciph.c set-up race.
+     [Adam Langley (Google)]
+
   *) Fix spurious failures in ecdsatest.c.
      [Emilia Käsper (Google)]
 
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index a8ce186b7..54ba7ef5b 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -446,6 +446,7 @@ static void load_builtin_compressions(void)
 						sk_SSL_COMP_push(ssl_comp_methods,comp);
 						}
 					}
+					sk_SSL_COMP_sort(ssl_comp_methods);
 				}
 			MemCheck_on();
 			}