--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,6 +139,10 @@
   set(PPC64LE 1)
 endif()
 
+if(ARCH_ID STREQUAL "s390x")
+  set(S390X 1)
+endif()
+
 if(WIN32 OR ARM)
   set(OPT_FLAGS_RELEASE "-O2")
 else()
@@ -592,10 +596,12 @@
     message(STATUS "AES support explicitly disabled")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNO_AES")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_AES")
-  elseif(NOT ARM AND NOT PPC64LE)
+  elseif(NOT ARM AND NOT PPC64LE AND NOT S390X)
     message(STATUS "AES support enabled")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
+  elseif(S390X)
+    message(STATUS "AES support not available on s390x")
   elseif(PPC64LE)
     message(STATUS "AES support not available on ppc64le")
   elseif(ARM6)