diff --git a/.travis.pushdoc b/.travis.pushdoc
index de0fab95fc6b91e53c80d90930d59576b0ff10b2..5259e2e38b94d1376f98ec49a541450a38e594ae 100755
--- a/.travis.pushdoc
+++ b/.travis.pushdoc
@@ -11,10 +11,10 @@ cd tmp/$$
 
 # grab doc
 mkdir user-doc
-cp -R $root/user-doc/{*.png,html,manual.pdf} user-doc/
+cp -R $root/user-doc/{html,manual.pdf} user-doc/
 test -d $root/user-doc/regtests && cp -R $root/user-doc/regtests user-doc/ || true
 mkdir developer-doc
-cp -R $root/developer-doc/{*.png,html} developer-doc/
+cp -R $root/developer-doc/html developer-doc/
 
 # This file should be here, it is needed otherwise
 # files beginning with _ are skipped
diff --git a/developer-doc/Makefile b/developer-doc/Makefile
index 5a3d7730a3ad64a3f4002dabb6602e0d8ee23f84..f62e49febc4f28472d18301879a74d9a9a2eafd7 100644
--- a/developer-doc/Makefile
+++ b/developer-doc/Makefile
@@ -4,7 +4,7 @@
 all:
 	./extract
 	./go-doxygen
-	cp Octocat.png html/
+	cp *png html/
 
 clean:
 	rm -fr automatic html latex *~ links-to-user-manual.txt
diff --git a/developer-doc/PlumedDeveloperHeader.html b/developer-doc/PlumedDeveloperHeader.html
index e2289dd06403502fff94bc40b3d429c0fe5b9b99..de3406df4b1f42516bde490601789db6ab56411b 100644
--- a/developer-doc/PlumedDeveloperHeader.html
+++ b/developer-doc/PlumedDeveloperHeader.html
@@ -23,9 +23,9 @@ $mathjax
 <table align="center" frame="void" width="98%" cellpadding="2%">
 <tbody>
 <tr style="height: 30px;">
-<td valign="center"> &nbsp; <img src="../pigeon.png" width="120"/></td>
-<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="../logo.png" width="400" /> </td>
-<td style="padding-left: 0.2em;" align="right"> <a href="../../user-doc/html/index.html"> <img src="../developer-logo.png" width="180" /> </a> </td>
+<td valign="center"> &nbsp; <img src="pigeon.png" width="120"/></td>
+<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="logo.png" width="400" /> </td>
+<td style="padding-left: 0.2em;" align="right"> <a href="../../user-doc/html/index.html"> <img src="developer-logo.png" width="180" /> </a> </td>
 </tr>
 </tbody>
 </table>
diff --git a/developer-doc/PlumedFooter.html b/developer-doc/PlumedFooter.html
index 8acdb8ba637e235b38c01bb3b43ea1c9679787fc..edca4cfa58d5ea5774d8a094ecd039d5273fa89c 100644
--- a/developer-doc/PlumedFooter.html
+++ b/developer-doc/PlumedFooter.html
@@ -15,7 +15,7 @@
 <table align="center" frame="void" width="98%" cellpadding="2%">
 <tr><td align="left" valign="center"> 
 Hosted by GitHub &nbsp;
-<a href="http://github.com"><img src="Octocat.png" width="88" height="66"  alt="GitHub Logo" /></a>
+<a href="http://github.com"><img src="octocat.png" width="88" height="66"  alt="GitHub Logo" /></a>
 <!--$generatedby  &#160; --> <a href="http://www.doxygen.org/index.html">
 </td><td width=90% align="right">
 <img class="footer" src="doxygen.png" alt="doxygen" align="right"/>
diff --git a/developer-doc/Octocat.png b/developer-doc/octocat.png
similarity index 100%
rename from developer-doc/Octocat.png
rename to developer-doc/octocat.png
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 97536a9bed40a51b360c8217fee737ee7cb55768..8cef825130226af76caa2a51430ce8149de132f9 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -92,7 +92,7 @@ install-do:
 # rebuild libraries and main using new target dir
 	$(MAKE) PLUMED_LIBDIR=$(PLUMED_INSTALL_ROOT)/src/lib/ PLUMED_INSTALL=Install all
 # copy .h, .cpp .o compile_options.sh and documentation:
-	cd ../../ ; tar cf - patches scripts src/*/*.h src/*/*.cpp src/*/*.o src/config/compile_options.sh *-doc/*.png *-doc/html *-doc/regtests *-doc/manual.pdf | tar xf - -C $(PLUMED_INSTALL_ROOT)/
+	cd ../../ ; tar cf - patches scripts src/*/*.h src/*/*.cpp src/*/*.o src/config/compile_options.sh *-doc/html *-doc/regtests *-doc/manual.pdf | tar xf - -C $(PLUMED_INSTALL_ROOT)/
 # also copy .h files into include/ dir
 	cd ../../src ; tar cf - */*.h */*/*.h | tar xf - -C $(PLUMED_INSTALL_PREFIX)/include/plumed$(PLUMED_INSTALL_LIBSUFFIX)/
 # copy inc files changing the path
diff --git a/user-doc/Makefile b/user-doc/Makefile
index b340104a01dbc3e8ec076e536257096247d2d43e..934a4267514520c4fc75eea82508d2659f1714d6 100644
--- a/user-doc/Makefile
+++ b/user-doc/Makefile
@@ -15,7 +15,7 @@ else
 all:
 	./extract
 	./go-doxygen
-	cp Octocat.png html/
+	cp *png html/
 	./report_errors
 
 endif
diff --git a/user-doc/PlumedFooter.html b/user-doc/PlumedFooter.html
index 8acdb8ba637e235b38c01bb3b43ea1c9679787fc..edca4cfa58d5ea5774d8a094ecd039d5273fa89c 100644
--- a/user-doc/PlumedFooter.html
+++ b/user-doc/PlumedFooter.html
@@ -15,7 +15,7 @@
 <table align="center" frame="void" width="98%" cellpadding="2%">
 <tr><td align="left" valign="center"> 
 Hosted by GitHub &nbsp;
-<a href="http://github.com"><img src="Octocat.png" width="88" height="66"  alt="GitHub Logo" /></a>
+<a href="http://github.com"><img src="octocat.png" width="88" height="66"  alt="GitHub Logo" /></a>
 <!--$generatedby  &#160; --> <a href="http://www.doxygen.org/index.html">
 </td><td width=90% align="right">
 <img class="footer" src="doxygen.png" alt="doxygen" align="right"/>
diff --git a/user-doc/PlumedUserHeader.html b/user-doc/PlumedUserHeader.html
index f3df1fdb9ea29c295bfcfa757b4dd12c1b38c04f..654dd87fd7d1415f3fe37675bb0deb784c653ffa 100644
--- a/user-doc/PlumedUserHeader.html
+++ b/user-doc/PlumedUserHeader.html
@@ -23,9 +23,9 @@ $mathjax
 <table align="center" frame="void" width="98%" cellpadding="2%">
 <tbody>
 <tr style="height: 30px;">
-<td valign="center"> &nbsp; <img src="../pigeon.png" width="120"/></td>
-<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="../logo.png" width="400" /> </td>
-<td style="padding-left: 0.2em;" align="right"> <a href="../../developer-doc/html/index.html"> <img src="../user-logo.png" width="180" /> </a> </td>
+<td valign="center"> &nbsp; <img src="pigeon.png" width="120"/></td>
+<td style="padding-left: 0.2em;" width="74%"> <a href="http://www.plumed-code.org"> <img src="logo.png" width="400" /> </td>
+<td style="padding-left: 0.2em;" align="right"> <a href="../../developer-doc/html/index.html"> <img src="user-logo.png" width="180" /> </a> </td>
 </tr>
 </tbody>
 </table>
diff --git a/user-doc/Octocat.png b/user-doc/octocat.png
similarity index 100%
rename from user-doc/Octocat.png
rename to user-doc/octocat.png