diff --git a/sys/Makefile.include b/sys/Makefile.include
index 827bc8aa33..1779637afa 100644
--- a/sys/Makefile.include
+++ b/sys/Makefile.include
@@ -77,7 +77,7 @@ ifneq (,$(filter printf_float,$(USEMODULE)))
   endif
 endif
 
-ifneq (,$(filter riotboot_%,$(USEMODULE)))
+ifneq (,$(filter riotboot,$(FEATURES_USED)))
   include $(RIOTBASE)/sys/riotboot/Makefile.include
 endif