diff --git a/src/arch/arm/tracers/SConscript b/src/arch/arm/tracers/SConscript
index ca012c5c2e..7b729ad065 100644
--- a/src/arch/arm/tracers/SConscript
+++ b/src/arch/arm/tracers/SConscript
@@ -43,7 +43,7 @@ Source('tarmac_tracer.cc', tags='arm isa')
 Source('tarmac_record.cc', tags='arm isa')
 Source('tarmac_record_v8.cc', tags='arm isa')
 
-if env['CONF']['HAVE_CAPSTONE']:
+if env['CONF']['USE_CAPSTONE']:
     SimObject('ArmCapstone.py', sim_objects=['ArmCapstoneDisassembler'],
-              tags=['capstone', 'arm isa'])
-    Source('capstone.cc', tags=['capstone', 'arm isa'])
+              tags=['arm isa'])
+    Source('capstone.cc', tags=['arm isa'])
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 33a00e9c45..e1f96678c8 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -27,3 +27,9 @@ config HAVE_CAPSTONE
     def_bool $(HAVE_CAPSTONE)
 
 rsource "kvm/Kconfig"
+
+config USE_CAPSTONE
+    depends on HAVE_CAPSTONE
+    depends on USE_ARM_ISA
+    bool "Use CapstoneDisassembler"
+    default y
diff --git a/src/cpu/SConscript b/src/cpu/SConscript
index 03ba7b924d..64c64903bd 100644
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
@@ -115,9 +115,11 @@ Source('simple_thread.cc')
 Source('thread_context.cc')
 Source('thread_state.cc')
 Source('timing_expr.cc')
-SourceLib('capstone', tags='capstone')
-Source('capstone.cc', tags='capstone')
-SimObject('Capstone.py', sim_objects=['CapstoneDisassembler'], tags='capstone')
+
+if env['CONF']['USE_CAPSTONE']:
+    SourceLib('capstone')
+    Source('capstone.cc')
+    SimObject('Capstone.py', sim_objects=['CapstoneDisassembler'])
 
 SimObject('DummyChecker.py', sim_objects=['DummyChecker'])
 Source('checker/cpu.cc')