diff --git a/user-doc/Doxyfile b/user-doc/Doxyfile
index 62abc0717ea61a0b100e4f611b1b469c2ab189a8..2cc5dbb5303dcb9e4a69d8fd49eea3133a6b061f 100644
--- a/user-doc/Doxyfile
+++ b/user-doc/Doxyfile
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "Plumed 2.1: user manual"
+PROJECT_NAME           = PLUMED
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -733,24 +733,11 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = IntroPP.txt \
-                         BiasPP.txt \
-                         AnalysisPP.txt \
-                         ColvarPP.txt \
-                         SyntaxPP.txt \
-                         FunctionsPP.txt \
-                         GroupPP.txt \
-                         InstallationPP.txt \
-                         GlossaryPP.txt \
-                         TutorialsPP.txt \
-                         ModulesPP.txt \
-                         MiscPP.txt \
-                         ToolsPP.txt \
-                         RegexPP.txt \
-                         ../CHANGES \
+INPUT                  = ../CHANGES \
                          tutorials \
                          automatic
 
+
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
diff --git a/user-doc/Makefile b/user-doc/Makefile
index 0f1afe88d2e5fac9b2331c2330a84840986c1d2f..83a525373cd37327a2ce28e8f1df813cc29fa453 100644
--- a/user-doc/Makefile
+++ b/user-doc/Makefile
@@ -14,7 +14,7 @@ else
 
 all:
 	./extract
-	doxygen
+	./go-doxygen
 	cp Octocat.png html/
 	./report_errors
 
diff --git a/user-doc/go-doxygen b/user-doc/go-doxygen
new file mode 100755
index 0000000000000000000000000000000000000000..4f8bc67a0a0442f38e7a263f00f298cedd00d2c0
--- /dev/null
+++ b/user-doc/go-doxygen
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+{
+  cat Doxyfile
+  echo "PROJECT_NUMBER = \"$(plumed info --version)\""
+  echo "INPUT+=" *PP.txt
+} | doxygen -