Index: boot/Makefile.common
===================================================================
--- boot/Makefile.common	(revision e175d69c617c81c9a4cfc0671129660b34333ff4)
+++ boot/Makefile.common	(revision 042fbe0c7c1554d67557bfe39825352d0ac29fbe)
@@ -122,7 +122,6 @@
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
 	RD_LIBS += \
-		$(USPACE_PATH)/lib/test/libtest.so.0 \
-		$(USPACE_PATH)/lib/c/libc.so.0 \
-		$(USPACE_PATH)/lib/softint/libsoftint.so.0
+		$(USPACE_PATH)/lib/c/libc.so0 \
+		$(USPACE_PATH)/lib/softint/libsofti.so0
 	RD_APPS += \
 		$(USPACE_PATH)/app/dltest/dltest
Index: tools/mkfat.py
===================================================================
--- tools/mkfat.py	(revision e175d69c617c81c9a4cfc0671129660b34333ff4)
+++ tools/mkfat.py	(revision 042fbe0c7c1554d67557bfe39825352d0ac29fbe)
@@ -190,9 +190,14 @@
 	parts = name.split('.')
 	
-	if (len(parts) > 0):
+	if len(parts) > 0:
 		fname = parts[0]
 	else:
 		fname = ''
-		
+	
+	if len(fname) > 8:
+		sys.stdout.write("mkfat.py: error: Directory entry " + name +
+		    " base name is longer than 8 characters\n")
+		sys.exit(1);
+	
 	return (fname + '          ').upper()[0:8]
 
@@ -201,8 +206,18 @@
 	parts = name.split('.')
 	
-	if (len(parts) > 1):
+	if len(parts) > 1:
 		ext = parts[1]
 	else:
 		ext = ''
+	
+	if len(parts) > 2:
+		sys.stdout.write("mkfat.py: error: Directory entry " + name +
+		    " has more than one extension\n")
+		sys.exit(1);
+	
+	if len(ext) > 3:
+		sys.stdout.write("mkfat.py: error: Directory entry " + name +
+		    " extension is longer than 3 characters\n")
+		sys.exit(1);
 	
 	return (ext + '   ').upper()[0:3]
Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision e175d69c617c81c9a4cfc0671129660b34333ff4)
+++ uspace/Makefile.common	(revision 042fbe0c7c1554d67557bfe39825352d0ac29fbe)
@@ -130,5 +130,5 @@
 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
 else
-BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
+BASE_LIBS = $(LIBC_PREFIX)/libc.so0 $(LIBSOFTINT_PREFIX)/libsofti.so0
 LFLAGS = -Bdynamic
 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
Index: uspace/lib/c/Makefile
===================================================================
--- uspace/lib/c/Makefile	(revision e175d69c617c81c9a4cfc0671129660b34333ff4)
+++ uspace/lib/c/Makefile	(revision 042fbe0c7c1554d67557bfe39825352d0ac29fbe)
@@ -52,5 +52,5 @@
 LIBRARY = libc
 SLIBRARY = libc.so.0.0
-LSONAME = libc.so.0
+LSONAME = libc.so0
 
 
Index: uspace/lib/softint/Makefile
===================================================================
--- uspace/lib/softint/Makefile	(revision e175d69c617c81c9a4cfc0671129660b34333ff4)
+++ uspace/lib/softint/Makefile	(revision 042fbe0c7c1554d67557bfe39825352d0ac29fbe)
@@ -32,8 +32,8 @@
 LIBRARY = libsoftint
 SLIBRARY = libsoftint.so.0.0
-LSONAME = libsoftint.so.0
+LSONAME = libsofti.so0
 
 SOURCES = \
-	generic/division.c\
+	generic/division.c \
 	generic/multiplication.c