diff --git a/psasim/.gitignore b/psasim/.gitignore
index 40715cafa..2e2994106 100644
--- a/psasim/.gitignore
+++ b/psasim/.gitignore
@@ -1,17 +1,20 @@
-bin/*
-*.o
-*.so
+# Intermediate generated files
+/include/psa_manifest/manifest.h
+/include/psa_manifest/pid.h
+/include/psa_manifest/sid.h
 /src/psa_functions_codes.h
 /src/psa_sim_crypto_client.c
 /src/psa_sim_crypto_server.c
 /src/psa_sim_serialise.c
 /src/psa_sim_serialise.h
-test/psa_ff_bootstrap.c
-test/psa_manifest/*
-test/client
-test/partition
-cscope.out
-*.orig
+
+# Build products
+/test/psa_manifest/*
+/test/client
+/test/partition
+*.so
+*psa_ff_bootstrap_*
+
+# Local files from editors and indexing tools
 *.swp
 *.DS_Store
-*psa_ff_bootstrap_*