diff --git a/.gitignore b/.gitignore
index 96bb4902398c..b4e26e094060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,8 +42,10 @@ security/manager/.nss.checkout
 /gecko.log
 
 # Build directories for js shell
-_DBG.OBJ/
-_OPT.OBJ/
+*_DBG.OBJ/
+*_OPT.OBJ/
+/js/src/*-obj/
+/js/src/obj-*/
 
 # SpiderMonkey configury
 js/src/configure
@@ -145,6 +147,6 @@ lextab.py
 /.tup
 
 # Ignore Visual Studio Code workspace files.
-.vscode/*
+.vscode/
 !.vscode/extensions.json
 !.vscode/tasks.json
diff --git a/.hgignore b/.hgignore
index 3a16cd261766..04ae7f88cbfb 100644
--- a/.hgignore
+++ b/.hgignore
@@ -43,6 +43,7 @@ compile_commands\.json
 _DBG\.OBJ/
 _OPT\.OBJ/
 ^js/src/.*-obj/
+^js/src/obj-.*/
 
 # SpiderMonkey configury
 ^js/src/configure$