diff --git a/libi2pd/CPU.cpp b/libi2pd/CPU.cpp
index d42f1ddd..14ce3788 100644
--- a/libi2pd/CPU.cpp
+++ b/libi2pd/CPU.cpp
@@ -9,12 +9,16 @@
 #include "CPU.h"
 #include "Log.h"
 
-#if defined(_MSC_VER)
-#include <intrin.h>
-
 #ifndef bit_AES
 	#define bit_AES (1 << 25)
 #endif
+
+#if (defined(__GNUC__) && __GNUC__ < 5)
+	#include <cpuid.h>
+#endif
+
+#ifdef _MSC_VER
+	#include <intrin.h>
 #endif
 
 namespace i2p
@@ -26,18 +30,18 @@ namespace cpu
 	inline bool cpu_support_aes()
 	{
 #if (defined(_M_AMD64) || defined(__x86_64__)) || (defined(_M_IX86) || defined(__i386__))
-#if defined(_MSC_VER)
-		int cpu_info[4];
-		__cpuid(cpu_info, 1);
-		return ((cpu_info[2] & bit_AES) != 0);
+#if (defined(__GNUC__) && __GNUC__ > 4)
+		__builtin_cpu_init();
+		return __builtin_cpu_supports("aes");
 #elif defined(__clang__)
 #if __clang_major__ >= 6
 		__builtin_cpu_init();
 #endif
 		return __builtin_cpu_supports("aes");
-#elif defined(__GNUC__)
-		__builtin_cpu_init();
-		return __builtin_cpu_supports("aes");
+#elif (defined(_MSC_VER) || (defined(__GNUC__) && __GNUC__ < 5))
+		int cpu_info[4];
+		__cpuid(cpu_info, 1);
+		return ((cpu_info[2] & bit_AES) != 0);
 #else
 		return false;
 #endif