diff --git a/matlab/warning_config.m b/matlab/warning_config.m
index 6b6f53306..6b19b83b6 100644
--- a/matlab/warning_config.m
+++ b/matlab/warning_config.m
@@ -10,7 +10,7 @@ function warning_config()
 % SPECIAL REQUIREMENTS
 %   none
 
-% Copyright (C) 2008-2013 Dynare Team
+% Copyright (C) 2008-2015 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -34,7 +34,11 @@ warning('on', 'backtrace');
 
 if isoctave
     warning('off', 'Octave:separator-insert');
-    warning('off', 'Octave:matlab-incompatible');
+    if octave_ver_less_than('4.0')
+        warning('off', 'Octave:matlab-incompatible');
+    else
+        warning('off', 'Octave:language-extension');
+    end
     warning('off', 'Octave:single-quote-string');
     warning('off', 'Octave:missing-semicolon');
     warning('off', 'Octave:empty-list-elements');