diff --git a/third-party/build_config.rb b/third-party/build_config.rb
index 7ddd2e9b..706e8741 100644
--- a/third-party/build_config.rb
+++ b/third-party/build_config.rb
@@ -4,7 +4,7 @@ MRuby::Build.new do |conf|
 
   # C++ project needs this.  Without this, mruby exception does not
   # properly destory C++ object allocated on stack.
-  conf.enable_cxx_abi
+  conf.enable_cxx_exception
 
   conf.build_dir = ENV['BUILD_DIR']
 
diff --git a/third-party/mruby b/third-party/mruby
index 22464fe5..46960936 160000
--- a/third-party/mruby
+++ b/third-party/mruby
@@ -1 +1 @@
-Subproject commit 22464fe5a0a10f2b077eaba109ce1e912e4a77de
+Subproject commit 4696093673c3352a1897490ecc5e4e4e40f463b5