Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision afa7c17d705e608325255afcc815277a14af63a4)
+++ uspace/Makefile.common	(revision 44d13113c58c0326c9815eee97a00f42642449bb)
@@ -251,5 +251,5 @@
 
 ifneq ($(BINARY),)
-%.disasm: $(BINARY)
+%.disasm: $(BINARY)_prestrip
 ifeq ($(CONFIG_LINE_DEBUG),y)
 	$(OBJDUMP) -d -S $< > $@
@@ -258,6 +258,11 @@
 endif
 
-$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+.INTERMEDIATE: $(BINARY)_prestrip
+
+$(BINARY)_prestrip: $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $@ $(OBJECTS) $(LIBS) $(BASE_LIBS)
+
+$(BINARY): $(BINARY)_prestrip $(BINARY).disasm
+	cp $(BINARY)_prestrip $@
 ifeq ($(CONFIG_STRIP_BINARIES),y)
 	$(STRIP) $(BINARY)
