diff --git a/.gitignore b/.gitignore
index 6de49d74e..e91950bf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,36 @@
-src/*.o
-src/*.exe
-src/*.res
-src/*.cfg
-src/*.log
-src/*.dll
-src/*.dmp
-src/NUL
-src/nvr/
-src/roms/
-/.vs
-/build
-/.vscode
+# CMake
 /CMakeUserPresets.json
 /CMakeCache.txt
+/build
 CMakeFiles
-*.cmake
-*.obj
-*.d
-*.a
-src/include/86box/version.h
 Makefile
+*.a
+*.cmake
+/src/*.exe
+/src/86Box
+/src/include/86box/version.h
+
+# Legacy Makefile
+/src/*.o
+/src/*.d
+/src/*.res
+/src/*.dll
+/src/NUL
+
+# State
+/src/*.cfg
+/src/*.log
+/src/*.dmp
+/src/nvr/
+/src/printer/
+/src/roms/
+/src/screenshots/
+
+# Build scripts
+/archive_tmp
+/static2dll.*
+/*.zip
+
+# Visual Studio Code
+/.vs
+/.vscode