diff --git a/CHANGES/v2.0.txt b/CHANGES/v2.0.txt
index 6d9773c148f528b490e6a1c3d527ffd9deb5577f..765e726d10775e54fc204d883a61d8a5621540fb 100644
--- a/CHANGES/v2.0.txt
+++ b/CHANGES/v2.0.txt
@@ -1,6 +1,9 @@
 /**
 
-@page CHANGES-2-0 CHANGES-2-0
+@page CHANGES-2-0 Version 2.0
+
+Version 2.0.0
+-------------
 
 Version 2.0 is a complete rewrite, so there is no way to write a complete set of difference
 with respect to plumed 1.3. Here is a summary of the difference:
@@ -17,17 +20,22 @@ In addition, it is now much easier to contribute new functionality to the code b
 - A modular structure 
 - Developer and user documentation 
 
-Version 2.0.1 (unpublised yet, check out branch v2.0 on git repository)
+Version 2.0.1 - unreleased
+--------------------------
+This version has not been released yet.
+See <a href="http://github.com/plumed/plumed2/tree/v2.0">branch v2.0 on git repository</a>.
 
 For users:
-- Fixed a bug in HISTOGRAM with REWEIGHT_BIAS. Reweighting was only done when also temperature-reweighing was enabled.
-- Fixed a bug that was sometime crashing the code with GROMACS, domain decompositions and implicit solvent.
-- Added message when "plumed simpled" is used on a non-existing file.
-- Several small fixes in documentation and log file
+- Fixed a bug in \ref HISTOGRAM with REWEIGHT_BIAS. Reweighting was only done when also temperature-reweighing was enabled.
+- Fixed a bug that was sometime crashing the code with GROMACS, domain decomposition and implicit solvent.
+- Added message when `plumed simpled` is used on a non-existing file.
+- Fixed `plumed mklib` such that it deletes the target shared library in case
+  of compilation error.
+- Several small fixes in documentation and log file.
 
 For developers:
-- Added possibility to setup replica exchange from MD codes in fortran (commands "GREX setMPIFIntercomm" and "GREX setMPIFIntracomm")
+- Added possibility to setup replica exchange from MD codes in fortran (commands "GREX setMPIFIntercomm" and "GREX setMPIFIntracomm").
 - cmd("setStopFlag") should now be called after PLUMED initialization.
-- Several small fixes in documentation
+- Several small fixes in documentation.
 
 */
diff --git a/user-doc/Doxyfile b/user-doc/Doxyfile
index a4ba042e8680172246d5f0e4ee26766805a14294..6b7ab2cd677ab04557f2bb30e20e0053b265c47c 100644
--- a/user-doc/Doxyfile
+++ b/user-doc/Doxyfile
@@ -470,7 +470,7 @@ INPUT                  = IntroPP.txt \
                          TutorialsPP.txt \
                          ModulesPP.txt \
                          RegexPP.txt \
-                         ../CHANGES/v2.0.txt \
+                         ../CHANGES \
                          tutorials \
                          automatic