diff --git a/.gitattributes b/.gitattributes
index e67a7254..097986bb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,22 +3,26 @@
 # HINT: check settings with
 #   git ls-files | git check-attr --stdin --all
 
-# tell GitHub and other diff-tools that these files are automatically generated
+#
+# tell diff tools that these files are generated automatically
+#
 
-doc/upx.1                               linguist-generated
-doc/upx-doc.*                           linguist-generated
+/doc/upx.1                              linguist-generated
+/doc/upx-doc.*                          linguist-generated
 
-src/stub/*.h                            linguist-generated
-src/stub/src/arch/**/lzma_d_c[fns].S    linguist-generated
-src/stub/tmp/**                         linguist-generated
+/src/stub/*.h                           linguist-generated
+/src/stub/src/arch/**/lzma_d_c[fns].S   linguist-generated
+/src/stub/tmp/**                        linguist-generated
 
+#
 # make GitHub language detection more accurate
+#
 
-src/*.h             linguist-language=C++
-src/*/*.h           linguist-language=C++
+/src/*.h                                linguist-language=C++
+/src/*/*.h                              linguist-language=C++
 
-src/stub/**/*.ash   linguist-language=Assembly
-src/stub/**/*.asm   linguist-language=Assembly
-src/stub/**/*.S     linguist-language=Assembly
+/src/stub/**/*.ash                      linguist-language=Assembly
+/src/stub/**/*.asm                      linguist-language=Assembly
+/src/stub/**/*.S                        linguist-language=Assembly
 
-src/stub/tmp/**     linguist-vendored
+/src/stub/tmp/**                        linguist-vendored
diff --git a/Makefile b/Makefile
index 0f250af9..4a10c3d6 100644
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,8 @@ build/analyze/clang-analyzer/%: CMAKE := scan-build $(CMAKE)
 build/analyze/clang-analyzer/%: export CCC_CC  ?= clang
 build/analyze/clang-analyzer/%: export CCC_CXX ?= clang++
 
-# run clang-tidy (uses file compile_commands.json from an existing clang build)
+# run clang-tidy: uses file compile_commands.json from an existing clang build
+# does not create any actual files, so purely PHONY
 RUN_CLANG_TIDY = time python3 ./misc/analyze/clang-tidy/run-clang-tidy.py -p $<
 RUN_CLANG_TIDY_WERROR = $(RUN_CLANG_TIDY) '-warnings-as-errors=*'
 build/analyze/clang-tidy-upx/debug build/analyze/clang-tidy-upx/release: build/extra/clang/$$(notdir $$@) PHONY