diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index c7a1d5f3ea3ed92d5d2fcad812abec3945b74691..211da84778add1c26c72e6b4abc774c244937ad8 100644
--- a/m4/ax_matlab_version.m4
+++ b/m4/ax_matlab_version.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2009-2014 Dynare Team
+dnl Copyright (C) 2009-2015 Dynare Team
 dnl
 dnl This file is part of Dynare.
 dnl
@@ -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
+    *2015a | *2015A)
+      MATLAB_VERSION="8.5"
+      ;;
     *2014b | *2014B)
       MATLAB_VERSION="8.4"
       ;;
diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index 160cd62220d550cf65a4a30c5a366264a9a9feaa..9426c7d7650cade3fd13db5c19be17863a1b4c29 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -119,7 +119,7 @@ if isoctave
 else
     % Add win32 specific paths for Dynare Windows package
     if strcmp(computer, 'PCWIN')
-        mexpath = [dynareroot '../mex/matlab/win32-7.5-8.4'];
+        mexpath = [dynareroot '../mex/matlab/win32-7.5-8.5'];
         if exist(mexpath, 'dir')
             addpath(mexpath)
         end
@@ -133,7 +133,7 @@ else
                 addpath(mexpath)
             end
         else
-            mexpath = [dynareroot '../mex/matlab/win64-7.8-8.4'];
+            mexpath = [dynareroot '../mex/matlab/win64-7.8-8.5'];
             if exist(mexpath, 'dir')
                 addpath(mexpath)
             end
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 6f7a45b7a13490facb3c9d998fb07cdc11b068ac..c6f062a1ce86e6f7ee722348d171672659672ed4 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -83,9 +83,9 @@ SectionEnd
 
 SectionGroup "MEX files for MATLAB"
 
-Section "MEX files for MATLAB 32-bit, version 7.5 to 8.4 (R2007b to R2014b)"
- SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.4
- File ..\mex\matlab\win32-7.5-8.4\*.mexw32
+Section "MEX files for MATLAB 32-bit, version 7.5 to 8.5 (R2007b to R2015a)"
+ SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.5
+ File ..\mex\matlab\win32-7.5-8.5\*.mexw32
 SectionEnd
 
 Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
@@ -93,9 +93,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.4 (R2009a to R2014b)"
- SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.4
- File ..\mex\matlab\win64-7.8-8.4\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 7.8 to 8.5 (R2009a to R2015a)"
+ SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.5
+ File ..\mex\matlab\win64-7.8-8.5\*.mexw64
 SectionEnd
 
 SectionGroupEnd