diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2224dc6..61c9bea5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,12 @@ set(src
 	src/sm3_hmac.c
 	src/sm3_kdf.c
 	src/sm3_digest.c
-	src/sm2_alg.c
-	src/sm2_sign.c
-	src/sm2_key.c
+	#src/sm2_alg.c
+	src/sm2_point.c
+	src/sm2_z256.c
+	src/sm2_z256_table.c
+	src/sm2_z256_key.c
+	src/sm2_z256_sign.c
 	src/sm2_lib.c
 	src/sm2_ctx.c
 	#src/sm9_alg.c
@@ -125,8 +128,9 @@ set(tools
 set(tests
 	sm4
 	sm3
-	sm2
-	#sm2_sign
+#	sm2
+	sm2_z256
+	sm2_sign
 	sm2_enc
 	#sm9
 	sm9_z256
@@ -242,6 +246,15 @@ if (ENABLE_SM2_ALGOR_ID_ENCODE_NULL)
 endif()
 
 
+option(ENABLE_SM2_Z256_ARMV8 "Enable SM2_Z256 ARMv8 assembly" OFF)
+if (ENABLE_SM2_Z256_ARMV8)
+	message(STATUS "ENABLE_SM2_Z256_ARMV8 is ON")
+	add_definitions(-DENABLE_SM2_Z256_ARMV8)
+	enable_language(ASM)
+	list(APPEND src src/sm2_z256_armv8.S)
+endif()
+
+
 option(ENABLE_SM2_PRIVATE_KEY_EXPORT "Enable export un-encrypted SM2 private key" OFF)
 if (ENABLE_SM2_PRIVATE_KEY_EXPORT)
 	message(STATUS "ENABLE_SM2_PRIVATE_KEY_EXPORT is ON")
@@ -320,15 +333,6 @@ if (ENABLE_SM4_XTS)
 endif()
 
 
-option(ENABLE_SM2_Z256 "Enable SM2 z256 implementation" OFF)
-if (ENABLE_SM2_Z256)
-	message(STATUS "ENABLE_SM2_Z256 is ON")
-	add_definitions(-DENABLE_SM2_Z256)
-	list(APPEND src src/sm2_z256.c src/sm2_z256_table.c src/sm2_z256_sign.c)
-	list(APPEND tests sm2_z256)
-endif()
-
-
 option(ENABLE_SM2_EXTS "Enable SM2 Extensions" OFF)
 if (ENABLE_SM2_EXTS)
 	message(STATUS "ENABLE_SM4_AESNI_AVX")
@@ -572,4 +576,3 @@ string(CONCAT CPACK_PACKAGE_DESCRIPTION_SUMMARY
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_NSIS_MODIFY_PATH ON)
 include(CPack)
-