diff --git a/common.mk b/common.mk
index afa2461736..9370b50095 100644
--- a/common.mk
+++ b/common.mk
@@ -201,7 +201,7 @@ main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs $(MJIT_MIN_HEADER)
 	@$(NULLCMD)
 
 .PHONY: mjit-headers
-mjit-headers: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time $(MJIT_MIN_HEADER) mjit_config.h
+mjit-headers: $(MJIT_MIN_HEADER) mjit_config.h
 
 mjit.$(OBJEXT): mjit_config.h
 mjit_config.h: Makefile
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 7f83e67c47..d3396dc8e3 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -149,8 +149,13 @@ ifeq ($(filter 0 1,$(words $(arch_flags))),)
 $(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \
 	  $(eval $$(MJIT_HEADER:.h=)-$(value x).h \
 		 $$(MJIT_MIN_HEADER:.h=)-$(value x).h \
+		 $$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time \
 		 : ARCH_FLAG := -arch $(value x)))
 
+$(foreach x,$(patsubst -arch=%,%,$(arch_flags)), \
+	$(eval $$(MJIT_HEADER:.h=)-$(value x).h: \
+		$$(TIMESTAMPDIR)/$$(MJIT_HEADER:.h=)-$(value x).time))
+
 mjit_min_headers := $(patsubst -arch=%,$(MJIT_MIN_HEADER:.h=-%.h),$(arch_flags))
 $(MJIT_MIN_HEADER): $(mjit_min_headers) $(PREP)
 	@ set -e; set $(patsubst -arch=%,%,$(arch_flags)); \