diff --git a/Configure b/Configure
index 0bb17822e7cc8c3116585febad9e451ef0ad13ed..184f5ba2e1c69a5fe637360812c9a5cd2714a80e 100755
--- a/Configure
+++ b/Configure
@@ -1408,6 +1408,8 @@ print OUT "#ifdef OPENSSL_ALGORITHM_DEFINES\n";
 print OUT $openssl_algorithm_defines_trans;
 print OUT "#endif\n\n";
 
+print OUT "#define OPENSSL_CPUID_OBJ\n\n" if ($cpuid_obj);
+
 while (<IN>)
 	{
 	if	(/^#define\s+OPENSSLDIR/)
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 79c54b920eb6aad9c7e9ba818a4e3f1642dc9651..23264ec8234b20a2919df3cf8c1851e99ca7d7bf 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -544,7 +544,7 @@ const char *CRYPTO_get_lock_name(int type)
 unsigned long  OPENSSL_ia32cap=0;
 unsigned long *OPENSSL_ia32cap_loc() { return &OPENSSL_ia32cap; }
 
-#if !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
+#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
 #define OPENSSL_CPUID_SETUP
 void OPENSSL_cpuid_setup()
 { static int trigger=0;