diff --git a/Installation-behind-a-firewall.rest b/Installation-behind-a-firewall.rest
index 1ed1067..81b9599 100644
--- a/Installation-behind-a-firewall.rest
+++ b/Installation-behind-a-firewall.rest
@@ -20,7 +20,6 @@
 
     make
 
-
 6) Start a `tsocks` ssh tunnel::
 
     ssh -fN -D 10000 user@external-server.com
@@ -30,8 +29,8 @@
     export LD_PRELOAD="${PWD}/libtsocks.so.1.8"
 
 8) Create a custom curl command to set the tsocks option: open a file named
-   ``curl``, which is accessible from your ``PATH`` environment variable before the
-   real ``curl`` command, and fill this file with::
+   ``curl``, which is accessible from your ``PATH`` environment variable before
+   the real ``curl`` command, and fill this file with::
 
     #!/bin/bash
     /usr/bin/curl --socks5 127.0.0.1:10000 $@
diff --git a/Installation-instructions.rest b/Installation-instructions.rest
index 023800a..ec01555 100644
--- a/Installation-instructions.rest
+++ b/Installation-instructions.rest
@@ -1,15 +1,12 @@
 Setup the environment::
 
-    make
+    ./setup_environment.sh
 
 This will automatically download and compile the requirements. 
 
-By default, the Ocaml compiler will be installed in ``$HOME/ocamlbrew``. To install it somewhere else, set the ``$OCAMLBREW_BASE`` environment variable to the required destination, for example::
-
-    export OCAMLBREW_BASE=/usr/local/ocamlbrew
-
-For more info about the Ocaml installation, check the ocamlbrew website : https://github.com/hcarty/ocamlbrew
-
+By default, the Ocaml compiler will be installed in ``$HOME/.opam``. 
+For more info about the Ocaml installation, check the Opam website :
+https://opam.ocaml.org/doc/Install.html
 
 A configuration file named ``quantum_package.rc`` will be created.
 To finish the installation, source this file in your shell::
@@ -22,11 +19,12 @@ If you use a C-shell, you will have to translate the ``.bashrc`` file into
 C-shell syntax and source it in your shell.
 
 Finally, create the ``Makefile.config`` file from the ``Makefile.config.example``.
-Note that the ``popcnt`` instruction accelerates *a lot* the programs, to the
+Note that the ``popcnt`` instruction accelerates *a lot* the programs, so the
 SSE4.2, AVX or AVX2 instruction sets should be enabled if possible.
 
 If you encounter an error saying that your Fortran compiler can't produce
-executables, it means that the built the program using an instruction set
+executables, it means that the program was built using an instruction set
 not supported by the current processor. In that case, use the ``-ax`` option
-of the Intel Fortran compiler instead of the ``-x`` option.
+of the Intel Fortran compiler instead of the ``-x`` option, or the
+``-march=native`` option of gfortran.
 
diff --git a/Requirements.md b/Requirements.md
index 334f50d..63f2ca2 100644
--- a/Requirements.md
+++ b/Requirements.md
@@ -1,11 +1,11 @@
 * Python > 2.6 : http://www.python.org
 * IRPF90 : http://irpf90.ups-tlse.fr
 * EZFIO : http://github.com/scemama/EZFIO
-* Intel Fortran compiler (with MKL library)
+* Fortran compiler : gfortran or ifort
+* Lapack library : liblapack.so or MKL
 * GNU make : http://www.gnu.org/software/make
-* Ocaml with Opam : https://raw.github.com/hcarty/ocamlbrew/master/ocamlbrew-install
+* Ocaml with Opam : https://opam.ocaml.org/doc/Install.html
 * m4 : http://www.gnu.org/software/m4/
 * curl : http://curl.haxx.se/
 * EMSL_Basis_Set_Exchange_Local : https://github.com/TApplencourt/EMSL_Basis_Set_Exchange_Local
 * Zlib : http://zlib.net
-* GNU Patch : http://savannah.gnu.org/projects/patch/