diff --git a/app-tools/Makefile.app-tools b/app-tools/Makefile.app-tools
index b3f518bc3..36b473c28 100644
--- a/app-tools/Makefile.app-tools
+++ b/app-tools/Makefile.app-tools
@@ -26,7 +26,6 @@ _APP_TOOL_TARGETS:= \
 app-tools: $(_APP_TOOL_TARGETS)
 
 APP_TOOLS_STUBLDLIBS := $(RUMP_STUBLDLIBS)
-APP_TOOLS_LDLIBS := $(RUMP_LDLIBS)
 
 APP_TOOLS_MAKE := $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-make
 APP_TOOLS_CC := $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-cc
@@ -46,7 +45,6 @@ $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-${1}:			\
 		-e 's#!CFLAGS!#$(BUILDRUMP_TOOL_CFLAGS)#g;'		\
 		-e 's#!CXXFLAGS!#$(BUILDRUMP_TOOL_CXXFLAGS)#g;'		\
 		-e 's#!OBJS_BAKE!#$(APP_TOOLS_OBJS_BAKE)#g;'		\
-		-e 's#!LDLIBS!#$(APP_TOOLS_LDLIBS)#g;'			\
 		-e 's#!STUBLDLIBS!#$(APP_TOOLS_STUBLDLIBS)#g;'		\
 		-e 's#!LDFLAGS_BAKE!#$(LDFLAGS_BAKE)#g;'		\
 		-e 's#!LDSCRIPT_BAKE!#$(APP_TOOLS_LDSCRIPT_BAKE)#g;'
diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in
index 183e2522b..946f6d3a4 100644
--- a/app-tools/specs-bake.in
+++ b/app-tools/specs-bake.in
@@ -5,7 +5,7 @@
 
 
 *lib:
-!LDFLAGS_BAKE! !LDLIBS!							\
+!LDFLAGS_BAKE! --whole-archive -lrump --no-whole-archive		\
     --start-group -lrumprun_base -lpthread -lc --end-group		\
     -lbmk_rumpuser -lbmk_core
 
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 8ce9be675..f728c7793 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -9,14 +9,11 @@ COREDIR:=       $(shell pwd)/../../lib/libbmk_core
 RUMPUSERDIR:=   $(shell pwd)/../../lib/libbmk_rumpuser
 BASEDIR:=       $(shell pwd)/../../lib/librumprun_base
 
-RUMPKERN_LIB:=	-lrump
-
 LDFLAGS_BAKE+=	-L${BASEDIR}/${PLATFORM} -L${COREDIR}/${PLATFORM}	\
 		-L${RUMPUSERDIR}/${PLATFORM}
 
 LIBS_USERSTUB:=	$(shell pwd)/pseudolinkstubs.o
 
-RUMP_LDLIBS:=	--whole-archive ${RUMPKERN_LIB} --no-whole-archive
 RUMP_STUBLDLIBS:=${LIBS_USERSTUB}
 
 .PHONY: ${BASEDIR}/${PLATFORM}/librumprun_base.a