diff --git a/doc/dynare.texi b/doc/dynare.texi
index 66e511a054c81da3b77990573c9814e43cb8f80a..796a3fa4a3ff771b13a282101ea72fe934b04606 100644
--- a/doc/dynare.texi
+++ b/doc/dynare.texi
@@ -378,8 +378,8 @@ MATLAB version 7.3 (R2006b) or above;
 GNU Octave version 3.4.0 or above.
 @end itemize
 
-Some installation instructions for GNU Octave can be found on the
-@uref{http://www.dynare.org/DynareWiki/DynareOctave,Dynare Wiki}.
+Packages of GNU Octave can be downloaded on the
+@uref{http://www.dynare.org/download/octave,Dynare website}.
 
 The following optional extensions are also useful to benefit from extra
 features, but are in no way required:
diff --git a/doc/macroprocessor/macroprocessor.tex b/doc/macroprocessor/macroprocessor.tex
index 8ecaf9510741ff16c739ef1311f38683292eb21c..432aaefc598ef28463d1341d945d9a5b20e5d65b 100644
--- a/doc/macroprocessor/macroprocessor.tex
+++ b/doc/macroprocessor/macroprocessor.tex
@@ -608,8 +608,6 @@ rhos = [ 0.8, 0.9, 1];
   \item Since version 4.0, Dynare works on top of Octave
   \item This makes Dynare 100\% free software
   \item Almost all features of Dynare work with Octave (very few exceptions)
-  \item For more information: \\
-    \url{http://www.dynare.org/DynareWiki/DynareOctave}
   \end{itemize}
 \end{frame}
 
diff --git a/windows/README.txt b/windows/README.txt
index 48f6d3739c16d9978fd97e568aa1e1187fcc8b2f..bea713b7ca6c4e0b47dbd330e4fc730cd09b2ec8 100644
--- a/windows/README.txt
+++ b/windows/README.txt
@@ -57,11 +57,11 @@ Using Dynare with Octave
 Dynare also works on top of GNU Octave, a free clone of MATLAB (R) (see
 <http://www.octave.org>).
 
-This version of Dynare is compiled for Octave 3.6.1 (MinGW), and may not work
-with other versions of Octave. You can download an installer for the right
-version of Octave at:
+This version of Dynare is compiled for Octave 3.6 (MinGW), and may not work
+with other versions of Octave. The recommended version of Octave can be
+downloaded at:
 
-  http://www.dynare.org/octave/Octave3.6.1_gcc4.6.2_20120303-setup.exe
+  http://www.dynare.org/download/octave/windows
 
 Every time you run Octave, you should type the two following commands (assuming
 that you have installed Dynare at the standard location, and replacing '4.x.y'
@@ -71,8 +71,8 @@ by correct version number):
 
 NOTE: if you don't want to type this command every time you run Octave, you can
 put it in a file called '.octaverc' in your home directory ('c:\Documents and
-Settings\USERNAME\' for Windows XP or 'c:\Users\USERNAME' for Windows 7). This
-file is run by Octave at every startup.
+Settings\USERNAME' for Windows XP or 'c:\Users\USERNAME' for Windows Vista/7).
+This file is run by Octave at every startup.
 
 You can test your installation by typing 'dynare' at the Octave prompt. This
 should give you an error message complaining that you did not specify a MOD
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index 44accbe6799afe4d29dbb8e1f67bdf819a496fe8..eeb99e03912f4af81e7057233acde76f71ef58bb 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -110,7 +110,7 @@ SectionEnd
 
 SectionGroupEnd
 
-Section "MEX files for Octave 3.6.1 (MinGW)"
+Section "MEX files for Octave 3.6 (MinGW)"
  SetOutPath $INSTDIR\mex\octave
  File ..\mex\octave\*.mex ..\mex\octave\*.oct
 SectionEnd