diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index 1004b91b9ec49f05ee5dcfe0501c3154bf4c2de0..cbd6325b109bd0123254dcb0f47ce55ecbb7b1d8 100644
--- a/m4/ax_matlab_version.m4
+++ b/m4/ax_matlab_version.m4
@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
 AC_MSG_CHECKING([for MATLAB version])
 if test "x$MATLAB_VERSION" != "x"; then
   case $MATLAB_VERSION in
+    *2018b | *2018B)
+      MATLAB_VERSION="9.5"
+      ;;
     *2018a | *2018A)
       MATLAB_VERSION="9.4"
       ;;
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 7bad24fd4d78d9f16bb05ad8a947e8425a5980f1..2b7cf760136ba434c9920ed6712424952a57844f 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -103,9 +103,9 @@ Section "MEX files for MATLAB 64-bit, version 7.8 to 9.3 (R2009a to R2017b)"
  File ..\mex\matlab\win64-7.8-9.3\*.mexw64
 SectionEnd
 
-Section "MEX files for MATLAB 64-bit, version 9.4 (R2018a)"
- SetOutPath $INSTDIR\mex\matlab\win64-9.4
- File ..\mex\matlab\win64-9.4\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 9.4 to 9.5 (R2018a to R2018b)"
+ SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.5
+ File ..\mex\matlab\win64-9.4-9.5\*.mexw64
 SectionEnd
 
 SectionGroupEnd