diff --git a/frame/base/bli_arch.c b/frame/base/bli_arch.c
index 3e6b028fe..d8e33672c 100644
--- a/frame/base/bli_arch.c
+++ b/frame/base/bli_arch.c
@@ -41,10 +41,9 @@ arch_t bli_arch_query_id( void )
 	arch_t id = -1;
 
 	// Architecture families.
-#ifdef BLIS_FAMILY_INTEL64
-	id = bli_cpuid_query_id();
-#endif
-#ifdef BLIS_FAMILY_AMD64
+#if defined BLIS_FAMILY_INTEL64 || \
+    defined BLIS_FAMILY_AMD64 || \
+    defined BLIS_FAMILY_X86_64
 	id = bli_cpuid_query_id();
 #endif
 
diff --git a/frame/include/bli_arch_config.h b/frame/include/bli_arch_config.h
index d0cfbc6aa..339cb1f1c 100644
--- a/frame/include/bli_arch_config.h
+++ b/frame/include/bli_arch_config.h
@@ -116,6 +116,9 @@ CNTX_INIT_PROTS( generic )
 #ifdef BLIS_FAMILY_AMD64
 #include "bli_family_amd64.h"
 #endif
+#ifdef BLIS_FAMILY_X86_64
+#include "bli_family_x86_64.h"
+#endif
 
 // -- Intel64 architectures --
 
diff --git a/frame/include/bli_kernel_macro_defs.h b/frame/include/bli_kernel_macro_defs.h
index dff8bb931..9ee0aa395 100644
--- a/frame/include/bli_kernel_macro_defs.h
+++ b/frame/include/bli_kernel_macro_defs.h
@@ -106,14 +106,19 @@
 #define BLIS_PAGE_SIZE                   4096
 #endif
 
-// Number of named SIMD vector registers available for use.
+// The maximum number of named SIMD vector registers available for use.
+// When configuring with umbrella configuration families, this should be
+// set to the maximum number of registers across all sub-configurations in
+// the family.
 #ifndef BLIS_SIMD_NUM_REGISTERS
-#define BLIS_SIMD_NUM_REGISTERS          16
+#define BLIS_SIMD_NUM_REGISTERS          32
 #endif
 
-// Size (in bytes) of each SIMD vector.
+// The maximum size (in bytes) of each SIMD vector.
+// When configuring with umbrella configuration families, this should be
+// set to the maximum SIMD size across all sub-configurations in the family.
 #ifndef BLIS_SIMD_SIZE
-#define BLIS_SIMD_SIZE                   32
+#define BLIS_SIMD_SIZE                   64
 #endif
 
 // Alignment size (in bytes) needed by the instruction set for aligned