diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index 438201f1bad48520d0056c08cdacf3f169244fc2..c6844453dc4f583d3399941678fb6fbb3ff3c41c 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
+    *2011a | *2011A)
+      MATLAB_VERSION="7.12"
+      ;;
     *2010b | *2010B)
       MATLAB_VERSION="7.11"
       ;;
diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index 895d4a074876768cc73abca11724676307b8e670..b36d821f6b7825f18837bb2c04d5489a8ddc134d 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -89,7 +89,7 @@ else
                 addpath(mexpath)
             end
         else
-            mexpath = [dynareroot '../mex/matlab/win32-7.5-7.11'];
+            mexpath = [dynareroot '../mex/matlab/win32-7.5-7.12'];
             if exist(mexpath, 'dir')
                 addpath(mexpath)
             end
@@ -114,7 +114,7 @@ else
                 addpath(mexpath)
             end
         else
-            mexpath = [dynareroot '../mex/matlab/win64-7.8-7.11'];
+            mexpath = [dynareroot '../mex/matlab/win64-7.8-7.12'];
             if exist(mexpath, 'dir')
                 addpath(mexpath)
             end
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 90595d59b842daaa1020e4e118aea92abdc6b5a9..7869e16018715af2f9031899c26168ba28f1f74c 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -80,9 +80,9 @@ Section "MEX files for MATLAB 32-bit, version 6.5 to 7.4 (R13 to R2007a)"
  File ..\mex\matlab\win32-6.5-7.4\*.dll
 SectionEnd
 
-Section "MEX files for MATLAB 32-bit, version 7.5 to 7.11 (R2007b to R2010b)"
- SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.11
- File ..\mex\matlab\win32-7.5-7.11\*.mexw32
+Section "MEX files for MATLAB 32-bit, version 7.5 to 7.12 (R2007b to R2011a)"
+ SetOutPath $INSTDIR\mex\matlab\win32-7.5-7.12
+ File ..\mex\matlab\win32-7.5-7.12\*.mexw32
 SectionEnd
 
 # Currently we don't have that version of MATLAB
@@ -101,9 +101,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 7.11 (R2009a to R2010b)"
- SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.11
- File ..\mex\matlab\win64-7.8-7.11\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 7.8 to 7.12 (R2009a to R2011a)"
+ SetOutPath $INSTDIR\mex\matlab\win64-7.8-7.12
+ File ..\mex\matlab\win64-7.8-7.12\*.mexw64
 SectionEnd
 
 SectionGroupEnd