diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc
index 4b5a650..1586463 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/aes.inc
@@ -1,5 +1,5 @@
 .PATH.S: ${.PARSEDIR}
-AES_SRCS = aes-586.S aesni-586.S
+AES_SRCS = aes-586.S aesni-x86.S
 AESNI = yes
 AESCPPFLAGS = -DAES_ASM -DOPENSSL_IA32_SSE2
 .include "../../aes.inc"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/evp.inc b/crypto/external/bsd/openssl/lib/libcrypto/evp.inc
index b28de91..6d6c217 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/evp.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/evp.inc
@@ -25,3 +25,14 @@ SRCS += ${EVP_SRCS}
 .for cryptosrc in ${EVP_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/evp
 .endfor
+
+EVP_AES_SRCS = e_aes.c
+
+# XXX Should do this too, but it requires some other asm changes.
+#EVP_AES_SRCS += e_aes_cbc_hmac_sha1.c
+
+.for cryptosrc in ${EVP_AES_SRCS}
+CPPFLAGS.${cryptosrc} += ${AESCPPFLAGS}
+.endfor
+
+CPPFLAGS.e_aes.c += -I${OPENSSLSRC}/crypto/modes
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/modes.inc b/crypto/external/bsd/openssl/lib/libcrypto/modes.inc
index 2dd007d..8bd5ca8 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/modes.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/modes.inc
@@ -16,4 +16,3 @@ SRCS += ${MODES_SRCS}
 .for cryptosrc in ${MODES_SRCS}
 CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/modes
 .endfor
-CPPFLAGS.e_aes.c = -I${OPENSSLSRC}/crypto/modes