diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index b3047770e5ea4427aaa42f65442776c3fc2ad499..2fae21f2c5294eb7c9e01aadb66a4d7d30af79dd 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
+    *2016a | *2016A)
+      MATLAB_VERSION="9.0"
+      ;;
     *2015b | *2015B)
       MATLAB_VERSION="8.6"
       ;;
diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m
index ff0f84114907c65679e0e187e54a5f5a59f35ce7..7408746cfcd57979e87357dcdb94ec63f2909e4c 100644
--- a/matlab/add_path_to_mex_files.m
+++ b/matlab/add_path_to_mex_files.m
@@ -48,7 +48,7 @@ else
                 end
             end
         else
-            tmp = [dynareroot '../mex/matlab/win64-7.8-8.6/'];
+            tmp = [dynareroot '../mex/matlab/win64-7.8-9.0/'];
             if exist(tmp, 'dir')
                 mexpath = tmp;
                 if modifypath
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 0e1d628c60dbd05da707b2b096dc1b7c66db4894..ea17caa4b3b125d5a0f2e6f56d1f8f620bcb47b1 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -98,9 +98,9 @@ Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
  File ..\mex\matlab\win64-7.5-7.7\*.mexw64
 SectionEnd
 
-Section "MEX files for MATLAB 64-bit, version 7.8 to 8.6 (R2009a to R2015b)"
- SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.6
- File ..\mex\matlab\win64-7.8-8.6\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 7.8 to 9.0 (R2009a to R2016a)"
+ SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.0
+ File ..\mex\matlab\win64-7.8-9.0\*.mexw64
 SectionEnd
 
 SectionGroupEnd