diff --git a/contrib/ms-sbvar/switch_dw b/contrib/ms-sbvar/switch_dw
index f21da3ff3..671802fcb 160000
--- a/contrib/ms-sbvar/switch_dw
+++ b/contrib/ms-sbvar/switch_dw
@@ -1 +1 @@
-Subproject commit f21da3ff380b5d3e86624a365bcc03e41f5cfdd1
+Subproject commit 671802fcb4597b56943897cd91be838230c256d1
diff --git a/mex/build/matlab/ms_sbvar/Makefile.am b/mex/build/matlab/ms_sbvar/Makefile.am
index 5f827a7d8..76ef9a096 100644
--- a/mex/build/matlab/ms_sbvar/Makefile.am
+++ b/mex/build/matlab/ms_sbvar/Makefile.am
@@ -1,2 +1,5 @@
 include ../mex.am
 include ../../ms_sbvar.am
+
+ms_sbvar_create_init_file_LDADD = -lut
+ms_sbvar_command_line_LDADD = -lut
diff --git a/mex/sources/ms-sbvar/modify_for_mex.h b/mex/sources/ms-sbvar/modify_for_mex.h
index e3b322092..cb477633f 100644
--- a/mex/sources/ms-sbvar/modify_for_mex.h
+++ b/mex/sources/ms-sbvar/modify_for_mex.h
@@ -32,6 +32,14 @@
 #define dw_free mxFree
 #define dw_exit msExit
 
+/* Handle Ctrl-C in Matlab/Octave */
+#ifdef MATLAB_MEX_FILE
+extern bool utIsInterruptPending();
+#else
+#include <octave/config.h>
+#include <octave/quit.h>
+#endif
+
 void msExit(int status);
 extern int constant_seed;