diff --git a/x86/Build.mk b/x86/Build.mk
index e78b35a04..5c5ebb59e 100644
--- a/x86/Build.mk
+++ b/x86/Build.mk
@@ -7,19 +7,15 @@ i686-assert = __i686__
 configs += x86_64
 x86_64-assert = __x86_64__
 
-#configs += x86asm
-#x86asm-assert = __i686__ || __x86_64__
-#x86asm-deps = nasm
-
-have_x86asm = $(and $(have_nasm),$(or $(have_i686),$(have_x86_64)))
+configs += x86asm
+x86asm-disabled = $(if $(and $(have_nasm),$(or $(have_i686),$(have_x86_64))),,y)
 
 nasmflags = -f $(if $(have_apple),macho,elf)$(if $(have_x86_64),64,32) \
     $(if $(have_apple),-DPREFIX) $(if $(have_pic),-DPIC) \
     -Pconfig.asm -Ix86 -I$(top_srcdir)/x86
 
 distfiles = config.asm.in x86inc.asm x86util.asm
-genfiles = config.asm
-#genfiles = $(if $(have_x86asm),config.asm)
+genfiles = $(if $(have_x86asm),config.asm)
 
 ARCH_X86_64 = $(if $(have_x86_64),1,0)