Index: uspace/app/bdsh/Makefile
===================================================================
--- uspace/app/bdsh/Makefile	(revision 741a7af97a6bf9ef56b7daf5b202cca4bd40abe5)
+++ uspace/app/bdsh/Makefile	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -31,8 +31,8 @@
 
 include ../../../version
--include ../../../Makefile.config
 
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -40,13 +40,5 @@
 
 LIBS = $(LIBC_PREFIX)/libc.a
-DEFS += -DRELEASE=\"$(RELEASE)\"
-
-ifdef REVISION
-	DEFS += "-DREVISION=\"$(TIMESTAMP)\""
-endif
-
-ifdef TIMESTAMP
-	DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
+DEFS += -DRELEASE=$(RELEASE)
 
 PROGRAM = bdsh
@@ -113,5 +105,5 @@
 
 $(PROGRAM): $(OBJECTS) $(LIBS)
-	$(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
+	$(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
 
 # Everything else is a phony target
Index: uspace/app/init/Makefile
===================================================================
--- uspace/app/init/Makefile	(revision 741a7af97a6bf9ef56b7daf5b202cca4bd40abe5)
+++ uspace/app/init/Makefile	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -28,5 +28,4 @@
 
 include ../../../version
--include ../../../Makefile.config
 
 ## Setup toolchain
@@ -35,4 +34,5 @@
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -40,13 +40,5 @@
 
 LIBS = $(LIBC_PREFIX)/libc.a
-DEFS += -DRELEASE=\"$(RELEASE)\"
-
-ifdef REVISION
-	DEFS += "-DREVISION=\"$(REVISION)\""
-endif
-
-ifdef TIMESTAMP
-	DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
+DEFS += -DRELEASE=$(RELEASE)
 
 ## Sources
@@ -73,5 +65,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/app/init/version.c
===================================================================
--- uspace/app/init/version.c	(revision 741a7af97a6bf9ef56b7daf5b202cca4bd40abe5)
+++ uspace/app/init/version.c	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -36,11 +36,12 @@
 #include <unistd.h>
 #include <stdio.h>
+#include <macros.h>
 #include "init.h"
 #include "version.h"
 
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 
 #ifdef REVISION
-	char *revision = ", revision " REVISION;
+	char *revision = ", revision " STRING(REVISION);
 #else
 	char *revision = "";
@@ -48,5 +49,5 @@
 
 #ifdef TIMESTAMP
-	char *timestamp = "\nBuilt on " TIMESTAMP;
+	char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
 	char *timestamp = "";
Index: uspace/app/klog/Makefile
===================================================================
--- uspace/app/klog/Makefile	(revision 741a7af97a6bf9ef56b7daf5b202cca4bd40abe5)
+++ uspace/app/klog/Makefile	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,8 +30,7 @@
 #
 
--include ../../../Makefile.config
-
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -61,5 +60,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/app/tester/Makefile
===================================================================
--- uspace/app/tester/Makefile	(revision 741a7af97a6bf9ef56b7daf5b202cca4bd40abe5)
+++ uspace/app/tester/Makefile	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,8 +30,7 @@
 #
 
--include ../../../Makefile.config
-
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -77,5 +76,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/app/tetris/Makefile
===================================================================
--- uspace/app/tetris/Makefile	(revision 741a7af97a6bf9ef56b7daf5b202cca4bd40abe5)
+++ uspace/app/tetris/Makefile	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -1,6 +1,5 @@
--include ../../../Makefile.config
-
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -21,5 +20,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
 
 clean:
Index: uspace/app/trace/Makefile
===================================================================
--- uspace/app/trace/Makefile	(revision 741a7af97a6bf9ef56b7daf5b202cca4bd40abe5)
+++ uspace/app/trace/Makefile	(revision bfd1546e49e40fb980d45ced0b409578ba8ab3ef)
@@ -30,8 +30,7 @@
 #
 
--include ../../../Makefile.config
-
 LIBC_PREFIX = ../../lib/libc
 SOFTINT_PREFIX = ../../lib/softint
+
 include $(LIBC_PREFIX)/Makefile.toolchain
 
@@ -66,5 +65,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: