diff --git a/Makefile b/Makefile
index a4bf4b570e..d59ea45be6 100644
--- a/Makefile
+++ b/Makefile
@@ -320,8 +320,6 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 TARGETS+=target-purgelocales
 endif
 
-include fs/common.mk
-
 # target stuff is last so it can override anything else
 include target/Makefile.in
 
diff --git a/target/Makefile.in b/target/Makefile.in
index afe96a7f05..ffcdbb64ed 100644
--- a/target/Makefile.in
+++ b/target/Makefile.in
@@ -62,6 +62,8 @@ ifeq ($(BR2_TARGET_UBOOT),y)
 include target/u-boot/Makefile.in
 endif
 
+include fs/common.mk
+
 # kernel rules
 # We already did add the kernel target to TARGETS and now just pull in the rules
 # to actually build this target.