diff --git a/ChangeLog b/ChangeLog
index 3f9cfae04..e22ac3cd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
    that doesn't work (see https://bugzilla.redhat.com/show_bug.cgi?id=1021897).
  - (dtucker) [configure.ac] Fix brackets in NID_secp521r1 test.
  - (dtucker) [configure.ac] Add missing "test".
+ - (dtucker) [key.c] Check for the correct defines for NID_secp521r1.
 
 20131108
  - (dtucker) OpenBSD CVS Sync
diff --git a/key.c b/key.c
index bc84953f3..b20bcda59 100644
--- a/key.c
+++ b/key.c
@@ -1104,7 +1104,7 @@ key_ecdsa_bits_to_nid(int bits)
 		return NID_X9_62_prime256v1;
 	case 384:
 		return NID_secp384r1;
-# ifdef HAVE_OPENSSL_NISTP521
+# ifdef OPENSSL_HAS_NISTP521
 	case 521:
 		return NID_secp521r1;
 # endif
@@ -2058,7 +2058,7 @@ key_curve_nid_to_bits(int nid)
 		return 256;
 	case NID_secp384r1:
 		return 384;
-# ifdef OPENSSL_NAS_NISTP521
+# ifdef OPENSSL_HAS_NISTP521
 	case NID_secp521r1:
 		return 521;
 # endif