diff --git a/Makefile.include b/Makefile.include
index 87d3073feb3d4fb4c86976488c55df5910c12019..2cd68506dccd129a1a11d6e6c30e41c22bc2da08 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -236,7 +236,6 @@ endif
 
 # the binaries to link
 BASELIBS += $(BINDIR)${APPLICATION}.a
-BASELIBS += $(USEPKG:%=${BINDIR}%.a)
 BASELIBS += $(APPDEPS)
 
 .PHONY: all clean flash term doc debug debug-server reset objdump help info-modules
diff --git a/Makefile.modules b/Makefile.modules
index 4a0a990b869b621d3c30d8fb297b4b208e466665..1fe2f48fcc3afbc671e5448c3fb01753f71b5e41 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -3,7 +3,7 @@ USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL
 ED = $(addprefix FEATURE_,$(sort $(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED))))
 ED += $(addprefix MODULE_,$(sort $(USEMODULE) $(USEPKG)))
 EXTDEFINES = $(addprefix -D,$(shell echo '$(ED)' | tr 'a-z-' 'A-Z_'))
-REALMODULES = $(filter-out $(PSEUDOMODULES), $(sort $(USEMODULE)))
+REALMODULES = $(filter-out $(PSEUDOMODULES), $(sort $(USEMODULE) $(USEPKG)))
 export BASELIBS += $(REALMODULES:%=$(BINDIR)%.a)
 
 CFLAGS += $(EXTDEFINES)