Index: boot/Makefile.build
===================================================================
--- boot/Makefile.build	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ boot/Makefile.build	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -93,11 +93,11 @@
 
 %.o: %.s | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.S | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS)
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS)
 
 depend: $(PRE_DEPEND)
Index: kernel/Makefile
===================================================================
--- kernel/Makefile	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ kernel/Makefile	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -414,11 +414,11 @@
 
 %.o: %.S | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.s | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION))
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION))
 
 $(REAL_MAP).o: $(REAL_MAP).bin
Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ uspace/Makefile.common	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -53,7 +53,7 @@
 #                      (e.g. uses thread-local variables)
 #
-# Optionally, for a libary:
-#   SLIBRARY           Name with full version, e.g. libfoo.so.0.0
-#   LSONAME            Soname / name with short version, e.g. libfoo.so.0
+# Optionally, for a library:
+#   SOVERSION            shared library version (major.minor),
+#                        if missing, no shared library is built
 #
 # (x) required variables
@@ -63,6 +63,4 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 
-VERSION_DEF = $(ROOT_PATH)/version
-
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 COMMON_HEADER = $(ROOT_PATH)/common.h
@@ -71,13 +69,13 @@
 CONFIG_HEADER = $(ROOT_PATH)/config.h
 
--include $(VERSION_DEF)
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 
+OUTPUTS = $(EXTRA_OUTPUT)
+
 ifneq ($(BINARY),)
 	JOB = $(BINARY).job
-	OUTPUT = $(BINARY)
 	TEST_BINARY = test-$(BINARY)
-	EXTRA_OUTPUT += $(BINARY).disasm
+	OUTPUTS += $(BINARY) $(BINARY).disasm
 	EXTRA_CLEAN += $(BINARY).map
 endif
@@ -85,16 +83,14 @@
 ifneq ($(LIBRARY),)
 	JOB = $(LIBRARY).job
-	OUTPUT = $(LIBRARY).a
 	TEST_BINARY = test-$(LIBRARY)
+	OUTPUTS += $(LIBRARY).a
 endif
 
 ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
-	ifneq ($(SLIBRARY),)
-		LARCHIVE = $(LIBRARY).la
-		LOUTPUT = $(SLIBRARY)
-		EXTRA_OUTPUT += $(LOUTPUT).disasm $(LIBRARY).so $(LSONAME)
-		EXTRA_CLEAN += $(LOUTPUT).map $(LOUTPUT).disasm \
-		    $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld \
-		    $(LIBRARY).so $(LSONAME)
+	ifneq ($(SOVERSION),)
+		SLIBRARY = $(LIBRARY).so.$(SOVERSION)
+		LSONAME = $(LIBRARY).so.$(basename $(SOVERSION))
+		OUTPUTS += $(SLIBRARY) $(SLIBRARY).disasm $(LSONAME)
+		EXTRA_CLEAN += $(LIBRARY).la $(SLIBRARY).map
 	endif
 endif
@@ -201,4 +197,6 @@
 endif
 
+LIB_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
+
 ifeq ($(MATH),y)
 	INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) $(LIBMATH_INCLUDES_FLAGS)
@@ -209,23 +207,13 @@
 # PCUT-based unit tests
 ifneq ($(TEST_SOURCES),)
-	TEST_OUTPUT = $(TEST_BINARY)
-	TEST_DISASM = $(TEST_BINARY).disasm
+	TEST_OUTPUTS = $(TEST_BINARY) $(TEST_BINARY).disasm
 	TEST_CFLAGS = -I$(LIB_PREFIX)/pcut/include -D__helenos__
-	TEST_OUTPUT_LIBS = $(LIB_PREFIX)/pcut/libpcut.a
-	EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map $(TEST_DISASM)
+	TEST_BINARY_LIBS = $(LIB_PREFIX)/pcut/libpcut.a
+	EXTRA_CLEAN += $(TEST_OUTPUTS) $(TEST_BINARY).map
 ifneq ($(LIBRARY),)
-	TEST_OUTPUT_LIBS += $(OUTPUT)
-endif
-	TEST_OUTPUT_LIBS += $(TEST_LIBS)
-endif
-
-.PHONY: all all-test clean depend
-
-all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT)
-
-all-test: $(TEST_OUTPUT) $(TEST_DISASM)
-
-clean:
-	rm -f $(JOB) $(OUTPUT) $(LARCHIVE) $(LOUTPUT) $(EXTRA_OUTPUT) $(EXTRA_CLEAN)
+	TEST_BINARY_LIBS += $(LIBRARY).a
+endif
+	TEST_BINARY_LIBS += $(TEST_LIBS)
+endif
 
 COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
@@ -288,5 +276,5 @@
 
 LIB_CFLAGS = $(CFLAGS) -fPIC
-LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME) --whole-archive
+LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME)
 
 AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
@@ -300,4 +288,15 @@
 -include $(DEPENDS)
 
+.PHONY: all all-test clean depend
+
+all: $(OUTPUTS)
+
+all-test: $(TEST_OUTPUTS)
+
+clean:
+	rm -f $(JOB) $(OUTPUTS) $(EXTRA_CLEAN)
+
+depend: $(PRE_DEPEND)
+
 %.disasm: %
 ifeq ($(CONFIG_LINE_DEBUG),y)
@@ -309,16 +308,10 @@
 ifneq ($(BINARY),)
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-endif
-
-ifneq ($(SLIBRARY),)
-$(LOUTPUT): $(LARCHIVE) $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
-	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld $(LIB_LFLAGS) $(LARCHIVE) -o $@ -Map $(LOUTPUT).map
-
-$(LIBRARY).so:
-	ln -s $(SLIBRARY) $@
-
-$(LSONAME):
-	ln -s $(SLIBRARY) $@
+	$(LD) $(LFLAGS) -T $(LINKER_SCRIPT) -Map $@.map -o $@ $(OBJECTS) $(LIBS) $(BASE_LIBS)
+endif
+
+ifneq ($(TEST_BINARY),)
+$(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS)
+	$(LD) $(LFLAGS) -T $(LINKER_SCRIPT) -Map $@.map -o $@ $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBS) $(BASE_LIBS)
 endif
 
@@ -328,41 +321,34 @@
 endif
 
-ifneq ($(LARCHIVE),)
-$(LARCHIVE): $(LOBJECTS)
+ifneq ($(SLIBRARY),)
+$(LIBRARY).la: $(LOBJECTS)
 	$(AR) rc $@ $(LOBJECTS)
-endif
-
-ifneq ($(TEST_OUTPUT),)
-$(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
-	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
+
+$(SLIBRARY): $(LIB_LINKER_SCRIPT) $(LIBRARY).la
+	$(LD) $(LIB_LFLAGS) -T $(LIB_LINKER_SCRIPT) -Map $@.map -o $@ --whole-archive $(LIBRARY).la --no-whole-archive
+
+$(LSONAME):
+	ln -s $(SLIBRARY) $@
 endif
 
 %.o: %.S | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.s | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.o: %.c | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
 
 %.test.o: %.c | depend
-	$(CC_JOB) -c -MD $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
+	$(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
 
 %.lo: %.S | depend
-	$(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
+	$(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.lo: %.s | depend
-	$(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
+	$(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__
 
 %.lo: %.c | depend
-	$(CC_JOB) -c -MD $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
-
-depend: $(PRE_DEPEND)
-
-##
-# This explicit dependecy of the output binary on the object files seems to be
-# necessary to prevent parallel build failures (GNU make bug #26893 ???).
-$(OUTPUT): $(OBJECTS)
-
-$(LARCHIVE): $(LOBJECTS)
+	$(CC_JOB) -c -MD -MP $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
+
Index: uspace/lib/c/Makefile
===================================================================
--- uspace/lib/c/Makefile	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ uspace/lib/c/Makefile	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -43,6 +43,5 @@
 EXTRA_CLEAN = $(LINKER_SCRIPTS)
 LIBRARY = libc
-SLIBRARY = libc.so.0.0
-LSONAME = libc.so.0
+SOVERSION = 0.0
 
 -include $(CONFIG_MAKEFILE)
Index: uspace/lib/dltest/Makefile
===================================================================
--- uspace/lib/dltest/Makefile	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ uspace/lib/dltest/Makefile	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -29,6 +29,5 @@
 USPACE_PREFIX = ../..
 LIBRARY = libdltest
-SLIBRARY = libdltest.so.0.0
-LSONAME = libdltest.so.0
+SOVERSION = 0.0
 
 SOURCES = \
Index: uspace/lib/math/Makefile
===================================================================
--- uspace/lib/math/Makefile	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ uspace/lib/math/Makefile	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -33,6 +33,5 @@
 
 LIBRARY = libmath
-SLIBRARY = libmath.so.0.0
-LSONAME = libmath.so.0
+SOVERSION = 0.0
 MATH = y
 
Index: uspace/lib/pcut/Makefile
===================================================================
--- uspace/lib/pcut/Makefile	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ uspace/lib/pcut/Makefile	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -35,5 +35,5 @@
 all-test: $(SELF_TESTS)
 
-test-libpcut-%: $(OUTPUT)
-	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(OUTPUT) $(BASE_LIBS)
+test-libpcut-%: $(LIBRARY).a
+	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
 
Index: uspace/lib/pcut/update-from-master.sh
===================================================================
--- uspace/lib/pcut/update-from-master.sh	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ uspace/lib/pcut/update-from-master.sh	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -79,6 +79,6 @@
 all-test: $(SELF_TESTS)
 
-test-libpcut-%: $(OUTPUT)
-	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(OUTPUT) $(BASE_LIBS)
+test-libpcut-%: $(LIBRARY).a
+	$(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
 
 EOF_MAKEFILE_TAIL
Index: uspace/lib/softint/Makefile
===================================================================
--- uspace/lib/softint/Makefile	(revision b8d4af4b62d44fdc3e0d372290cbf84be3de426e)
+++ uspace/lib/softint/Makefile	(revision c631734dadf94732aebdff5d84a80b87e470fee1)
@@ -31,6 +31,5 @@
 EXTRA_CFLAGS = -Iinclude
 LIBRARY = libsoftint
-SLIBRARY = libsoftint.so.0.0
-LSONAME = libsoftint.so.0
+SOVERSION = 0.0
 
 SOURCES = \