Index: uspace/srv/fs/fat/Makefile
===================================================================
--- uspace/srv/fs/fat/Makefile	(revision 4863e50b336ded576421bbf2f134c80e43dcc370)
+++ uspace/srv/fs/fat/Makefile	(revision 751d51bfc954dc78b2e85bb938b7979e5a75b33d)
@@ -30,10 +30,9 @@
 #
 
--include ../../../../Makefile.config
-
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
 LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -71,5 +70,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: $(OUTPUT).disasm
Index: uspace/srv/fs/fat/fat.c
===================================================================
--- uspace/srv/fs/fat/fat.c	(revision 4863e50b336ded576421bbf2f134c80e43dcc370)
+++ uspace/srv/fs/fat/fat.c	(revision 751d51bfc954dc78b2e85bb938b7979e5a75b33d)
@@ -123,5 +123,5 @@
 	int rc;
 
-	printf("FAT: HelenOS FAT file system server.\n");
+	printf("fat: HelenOS FAT file system server.\n");
 
 	rc = fat_idx_init();
Index: uspace/srv/fs/tmpfs/Makefile
===================================================================
--- uspace/srv/fs/tmpfs/Makefile	(revision 4863e50b336ded576421bbf2f134c80e43dcc370)
+++ uspace/srv/fs/tmpfs/Makefile	(revision 751d51bfc954dc78b2e85bb938b7979e5a75b33d)
@@ -30,10 +30,9 @@
 #
 
--include ../../../../Makefile.config
-
 LIBC_PREFIX = ../../../lib/libc
 LIBFS_PREFIX = ../../../lib/libfs
 LIBBLOCK_PREFIX = ../../../lib/libblock
 SOFTINT_PREFIX = ../../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -69,5 +68,5 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
+	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 disasm: $(OUTPUT).disasm