diff --git a/.gitignore b/.gitignore
index 1c4acc62e6..002c4a6f9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,27 +79,38 @@ test/testfiles/Makefile.in
 test/testfiles/plist_files/Makefile.in
 testpar/Makefile.in
 tools/Makefile.in
-tools/h5copy/Makefile.in
-tools/h5copy/testfiles/Makefile.in
-tools/h5diff/Makefile.in
-tools/h5diff/testfiles/Makefile.in
-tools/h5dump/Makefile.in
-tools/h5dump/errfiles/Makefile.in
-tools/h5format_convert/Makefile.in
-tools/h5import/Makefile.in
-tools/h5import/testfiles/Makefile.in
-tools/h5jam/Makefile.in
-tools/h5jam/testfiles/Makefile.in
-tools/h5ls/Makefile.in
-tools/h5repack/Makefile.in
-tools/h5repack/testfiles/Makefile.in
-tools/h5stat/Makefile.in
-tools/h5stat/testfiles/Makefile.in
 tools/lib/Makefile.in
-tools/misc/Makefile.in
-tools/misc/testfiles/Makefile.in
-tools/misc/vds/Makefile.in
-tools/perform/Makefile.in
 tools/testfiles/Makefile.in
 tools/testfiles/pbits/Makefile.in
 tools/testfiles/vds/Makefile.in
+tools/src/h5copy/Makefile.in
+tools/src/h5diff/Makefile.in
+tools/src/h5dump/Makefile.in
+tools/src/h5format_convert/Makefile.in
+tools/src/h5import/Makefile.in
+tools/src/h5jam/Makefile.in
+tools/src/h5ls/Makefile.in
+tools/src/h5repack/Makefile.in
+tools/src/h5stat/Makefile.in
+tools/src/misc/Makefile.in
+tools/src/misc/vds/Makefile.in
+tools/test/h5copy/Makefile.in
+tools/test/h5copy/testfiles/Makefile.in
+tools/test/h5diff/Makefile.in
+tools/test/h5diff/testfiles/Makefile.in
+tools/test/h5dump/Makefile.in
+tools/test/h5dump/errfiles/Makefile.in
+tools/test/h5format_convert/Makefile.in
+tools/test/h5import/Makefile.in
+tools/test/h5import/testfiles/Makefile.in
+tools/test/h5jam/Makefile.in
+tools/test/h5jam/testfiles/Makefile.in
+tools/test/h5ls/Makefile.in
+tools/test/h5repack/Makefile.in
+tools/test/h5repack/testfiles/Makefile.in
+tools/test/h5stat/Makefile.in
+tools/test/h5stat/testfiles/Makefile.in
+tools/test/misc/Makefile.in
+tools/test/misc/testfiles/Makefile.in
+tools/test/misc/vds/Makefile.in
+tools/test/perform/Makefile.in