diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 37c7e43..d5039cc 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1031,7 +1031,9 @@
 	/* Now arrange all ciphers by preference:
 	 * TODO(davidben): Compute this order once and copy it. */
 
-	/* Everything else being equal, prefer ephemeral ECDH over other key exchange mechanisms */
+	/* Everything else being equal, prefer ECDHE_ECDSA then ECDHE_RSA over
+         * other key exchange mechanisms */
+	ssl_cipher_apply_rule(0, SSL_kEECDH, SSL_aECDSA, 0, 0, 0, 0, CIPHER_ADD, -1, 0, &head, &tail);
 	ssl_cipher_apply_rule(0, SSL_kEECDH, 0, 0, 0, 0, 0, CIPHER_ADD, -1, 0, &head, &tail);
 	ssl_cipher_apply_rule(0, SSL_kEECDH, 0, 0, 0, 0, 0, CIPHER_DEL, -1, 0, &head, &tail);