diff --git a/common.mk b/common.mk
index a40b8b3e08d8be..a4e5063cdbafa9 100644
--- a/common.mk
+++ b/common.mk
@@ -1037,6 +1037,7 @@ BUILTIN_RB_SRCS = \
 		$(srcdir)/timev.rb \
 		$(srcdir)/prelude.rb \
 		$(srcdir)/gem_prelude.rb \
+		$(srcdir)/ujit.rb \
 		$(empty)
 BUILTIN_RB_INCS = $(BUILTIN_RB_SRCS:.rb=.rbinc)
 
@@ -15409,6 +15410,7 @@ ujit_core.$(OBJEXT): {$(VPATH)}vm_core.h
 ujit_core.$(OBJEXT): {$(VPATH)}vm_debug.h
 ujit_core.$(OBJEXT): {$(VPATH)}vm_opts.h
 ujit_core.$(OBJEXT): {$(VPATH)}vm_sync.h
+ujit_iface.$(OBJEXT): {$(VPATH)}ujit.rbinc
 ujit_iface.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
 ujit_iface.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
 ujit_iface.$(OBJEXT): $(CCAN_DIR)/list/list.h
diff --git a/configure.ac b/configure.ac
index 5aaecbaa0a3734..f63a62735e9c7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1155,6 +1155,15 @@ AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
 AC_CHECK_LIB(socket, shutdown)  # SunOS/Solaris
 
+if pkg-config --exists capstone; then
+   CAPSTONE_CFLAGS=`pkg-config --cflags capstone`
+   CAPSTONE_LIB_L=`pkg-config --libs-only-L capstone`
+   LDFLAGS="$LDFLAGS $CAPSTONE_LIB_L"
+   CFLAGS="$CFLAGS $CAPSTONE_CFLAGS"
+fi
+
+AC_CHECK_LIB(capstone, cs_open) # Capstone
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
diff --git a/inits.c b/inits.c
index d2c99ed495402f..601bc9405ab9a8 100644
--- a/inits.c
+++ b/inits.c
@@ -97,6 +97,7 @@ rb_call_builtin_inits(void)
     BUILTIN(array);
     BUILTIN(kernel);
     BUILTIN(timev);
+    BUILTIN(ujit);
     Init_builtin_prelude();
 }
 #undef CALL
diff --git a/misc/ujit_disasm.rb b/misc/ujit_disasm.rb
deleted file mode 100644
index 38eb139c33db01..00000000000000
--- a/misc/ujit_disasm.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-begin
-    require "crabstone"
-    require "stringio"
-rescue LoadError => e
-  puts "Please install crabstone, which is needed by the disassembler:"
-  puts "  $ brew install capstone"
-  puts "  $ gem install capstone"
-  raise e
-end
-
-module UJIT
-  def self.disasm(iseq)
-    blocks = UJIT.blocks_for(iseq)
-    return if blocks.empty?
-
-    io = StringIO.new
-
-    cs = Crabstone::Disassembler.new(Crabstone::ARCH_X86, Crabstone::MODE_64)
-
-    io.puts iseq.disasm
-
-    blocks.sort_by(&:address).reverse.each do |block|
-      io.puts "== ISEQ RANGE: #{block.iseq_start_index} -> #{block.iseq_end_index} ".ljust(80, "=")
-      cs.disasm(block.code, 0).each do |i|
-        io.printf(
-          "\t0x%<address>x:\t%<instruction>s\t%<details>s\n",
-          address: i.address,
-          instruction: i.mnemonic,
-          details: i.op_str
-        )
-      end
-    end
-    io.string
-  end
-end
diff --git a/ujit.rb b/ujit.rb
new file mode 100644
index 00000000000000..43be881c05ea1e
--- /dev/null
+++ b/ujit.rb
@@ -0,0 +1,28 @@
+module UJIT
+  def self.disasm(iseq)
+    blocks = UJIT.blocks_for(iseq)
+    return if blocks.empty?
+
+    str = ""
+
+    cs = UJIT::Disasm.new
+
+    str << iseq.disasm
+    str << "\n"
+
+    blocks.sort_by(&:address).reverse.each do |block|
+      str << "== ISEQ RANGE: #{block.iseq_start_index} -> #{block.iseq_end_index} ".ljust(80, "=")
+      str << "\n"
+
+      cs.disasm(block.code, 0).each do |i|
+        str << sprintf(
+          "\t0x%<address>x:\t%<instruction>s\t%<details>s\n",
+          address: i.address,
+          instruction: i.mnemonic,
+          details: i.op_str
+        )
+      end
+    end
+    str
+  end if defined?(Disasm)
+end
diff --git a/ujit_iface.c b/ujit_iface.c
index ea7445e4ed3b83..722961b03c923e 100644
--- a/ujit_iface.c
+++ b/ujit_iface.c
@@ -13,8 +13,15 @@
 #include "ujit_codegen.h"
 #include "ujit_core.h"
 #include "ujit_hooks.inc"
+#include "ujit.rbinc"
+
+#if HAVE_LIBCAPSTONE
+#include <capstone/capstone.h>
+#endif
 
 VALUE cUjitBlock;
+VALUE cUjitDisasm;
+VALUE cUjitDisasmInsn;
 
 extern st_table * version_tbl;
 extern codeblock_t *cb;
@@ -366,6 +373,44 @@ iseq_end_index(VALUE self)
     return INT2NUM(block->end_idx);
 }
 
+#if HAVE_LIBCAPSTONE
+static const rb_data_type_t ujit_disasm_type = {
+    "UJIT/Disasm",
+    {0, (void(*)(void *))cs_close, 0, },
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+ujit_disasm_init(VALUE klass)
+{
+    csh * handle;
+    VALUE disasm = TypedData_Make_Struct(klass, csh, &ujit_disasm_type, handle);
+    cs_open(CS_ARCH_X86, CS_MODE_64, handle);
+    return disasm;
+}
+
+static VALUE
+ujit_disasm(VALUE self, VALUE code, VALUE from)
+{
+    size_t count;
+    csh * handle;
+    cs_insn *insns;
+
+    TypedData_Get_Struct(self, csh, &ujit_disasm_type, handle);
+    count = cs_disasm(*handle, StringValuePtr(code), RSTRING_LEN(code), NUM2INT(from), 0, &insns);
+    VALUE insn_list = rb_ary_new_capa(count);
+
+    for (size_t i = 0; i < count; i++) {
+        VALUE vals = rb_ary_new_from_args(3, LONG2NUM(insns[i].address),
+                rb_str_new2(insns[i].mnemonic),
+                rb_str_new2(insns[i].op_str));
+        rb_ary_push(insn_list, rb_struct_alloc(cUjitDisasmInsn, vals));
+    }
+    cs_free(insns, count);
+    return insn_list;
+}
+#endif
+
 void
 rb_ujit_init(void)
 {
@@ -389,6 +434,14 @@ rb_ujit_init(void)
     rb_define_method(cUjitBlock, "iseq_start_index", iseq_start_index, 0);
     rb_define_method(cUjitBlock, "iseq_end_index", iseq_end_index, 0);
 
+#if HAVE_LIBCAPSTONE
+    cUjitDisasm = rb_define_class_under(mUjit, "Disasm", rb_cObject);
+    rb_define_alloc_func(cUjitDisasm, ujit_disasm_init);
+    rb_define_method(cUjitDisasm, "disasm", ujit_disasm, 2);
+
+    cUjitDisasmInsn = rb_struct_define_under(cUjitDisasm, "Insn", "address", "mnemonic", "op_str", NULL);
+#endif
+
     // Initialize the GC hooks
     method_lookup_dependency = st_init_numtable();
     struct ujit_root_struct *root;