diff --git a/src/disassembler.cc b/src/disassembler.cc
index 5e3f500..3396229 100644
--- a/src/disassembler.cc
+++ b/src/disassembler.cc
@@ -19,6 +19,7 @@
 #include <iostream>
 
 #include "disassembler_arm.h"
+#include "disassembler_x86.h"
 #include "logging.h"
 
 namespace art {
@@ -26,6 +27,8 @@
 Disassembler* Disassembler::Create(InstructionSet instruction_set) {
   if (instruction_set == kArm || instruction_set == kThumb2) {
     return new arm::DisassemblerArm();
+  } else if (instruction_set == kX86) {
+    return new x86::DisassemblerX86();
   } else {
     UNIMPLEMENTED(FATAL) << "no disassembler for " << instruction_set;
     return NULL;