diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 250be82..de932c9 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -359,6 +359,7 @@ set(
 	ec/ec_cvt.c
 	ec/ec_err.c
 	ec/ec_key.c
+	ec/ec_kmeth.c
 	ec/ec_lib.c
 	ec/ec_mult.c
 	ec/ec_oct.c
@@ -397,6 +398,7 @@ set(
 	engine/tb_dsa.c
 	engine/tb_ecdh.c
 	engine/tb_ecdsa.c
+	engine/tb_eckey.c
 	engine/tb_pkmeth.c
 	engine/tb_rand.c
 	engine/tb_rsa.c
@@ -833,6 +835,8 @@ target_include_directories(crypto
 		asn1
 		bn
 		dsa
+		ec
+		ecdsa
 		evp
 		modes
 		../include/compat
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index d72e182..716003c 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.am.common
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/ec
+AM_CPPFLAGS += -I$(top_srcdir)/crypto/ecdsa
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
 AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
 AM_CPPFLAGS += -I$(top_srcdir)/crypto
@@ -520,6 +521,7 @@ libcrypto_la_SOURCES += ec/ec_curve.c
 libcrypto_la_SOURCES += ec/ec_cvt.c
 libcrypto_la_SOURCES += ec/ec_err.c
 libcrypto_la_SOURCES += ec/ec_key.c
+libcrypto_la_SOURCES += ec/ec_kmeth.c
 libcrypto_la_SOURCES += ec/ec_lib.c
 libcrypto_la_SOURCES += ec/ec_mult.c
 libcrypto_la_SOURCES += ec/ec_oct.c
@@ -567,6 +569,7 @@ libcrypto_la_SOURCES += engine/tb_digest.c
 libcrypto_la_SOURCES += engine/tb_dsa.c
 libcrypto_la_SOURCES += engine/tb_ecdh.c
 libcrypto_la_SOURCES += engine/tb_ecdsa.c
+libcrypto_la_SOURCES += engine/tb_eckey.c
 libcrypto_la_SOURCES += engine/tb_pkmeth.c
 libcrypto_la_SOURCES += engine/tb_rand.c
 libcrypto_la_SOURCES += engine/tb_rsa.c