diff --git a/.gitignore b/.gitignore
index 668630512c9..59148ed0499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.arlock
 .depend
 Make.dep
 *.o
@@ -16,8 +15,8 @@ cscope.out
 /external
 /.context
 /.config
-/.depend
 /*.lib
+/*.lock
 /romfs.img
 /boot_romfsimg.h
 /symtab_apps.c
diff --git a/Make.defs b/Make.defs
index 89a649b39c0..505af7d4409 100644
--- a/Make.defs
+++ b/Make.defs
@@ -100,7 +100,7 @@ endef
 endif
 
 define ARLOCK
-	$(Q) flock .arlock $(call ARCHIVE, $1, $(2))
+	$(Q) flock $1.lock $(call ARCHIVE, $1, $(2))
 endef
 
 # Tools
diff --git a/Makefile b/Makefile
index dfb9da882df..6744ef7c445 100644
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,7 @@ else
 		fi; \
 	)
 endif
-	$(call DELFILE, .arlock)
+	$(call DELFILE, *.lock)
 	$(call DELFILE, .depend)
 	$(call DELFILE, $(SYMTABSRC))
 	$(call DELFILE, $(SYMTABOBJ))