diff --git a/CHANGES b/CHANGES
index cbc79829c501ea0bbe38a9ab0176082bf14e00e6..48ac44e80aa02b12c8af56798ebd3c18e561efa8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,9 @@
          *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
          +) applies to 0.9.7 only
 
+  *) Fix EVP_CIPHER_mode macro.
+     ["Dan S. Camper" <dan@bti.net>]
+
   +) Change the AES code to follow the same name structure as all other
      symmetric ciphers, and behave the same way.  Move everything to
      the directory crypto/aes, thereby obsoleting crypto/rijndael.
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 8d86d85f8d988dd8eddcfbc0635eb98fe5d9b97a..beb2c9eb44bd17430bef3a5711cc764ffd4b68e5 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -409,7 +409,7 @@ typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 #define EVP_CIPHER_key_length(e)	((e)->key_len)
 #define EVP_CIPHER_iv_length(e)		((e)->iv_len)
 #define EVP_CIPHER_flags(e)		((e)->flags)
-#define EVP_CIPHER_mode(e)		((e)->flags) & EVP_CIPH_MODE)
+#define EVP_CIPHER_mode(e)		(((e)->flags) & EVP_CIPH_MODE)
 
 #define EVP_CIPHER_CTX_cipher(e)	((e)->cipher)
 #define EVP_CIPHER_CTX_nid(e)		((e)->cipher->nid)