Index: uspace/app/init/Makefile
===================================================================
--- uspace/app/init/Makefile	(revision 9a0367fa3b9a9c76101f2153a0f10900ea972c2b)
+++ uspace/app/init/Makefile	(revision 98a4e76b4160ea2db9e82981125a143f0b747421)
@@ -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