Index: boot/arch/sparc64/Makefile.inc
===================================================================
--- boot/arch/sparc64/Makefile.inc	(revision fd375a8d1ed315622d230241a9b3227ec34ba99e)
+++ boot/arch/sparc64/Makefile.inc	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
@@ -29,41 +29,37 @@
 TMP = distroot
 
-ifeq ($(CONFIG_AOUT_ISOFS_B),n)
-	SILO_PACKAGE=silo.patched.tar.gz
-endif
-
 ifeq ($(CONFIG_AOUT_ISOFS_B),y)
-	SILO_PACKAGE=silo.tar.gz
+	SILO_PACKAGE = silo.tar.gz
+else
+	SILO_PACKAGE = silo.patched.tar.gz
 endif
 
 build: $(BASE)/image.iso
 
-ifeq ($(CONFIG_RD_EXTERNAL),y)
-SILO_CONF_FILTER = cat
-else
-SILO_CONF_FILTER = grep -v initrd
-endif
-
-$(BASE)/image.iso: depend arch/$(ARCH)/loader/image.boot
+$(BASE)/image.iso: depend arch/$(BARCH)/loader/image.boot
 	mkdir -p $(TMP)/boot
 	mkdir -p $(TMP)/HelenOS
-	cat arch/$(ARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
-	cp arch/$(ARCH)/silo/README arch/$(ARCH)/silo/COPYING $(TMP)/boot
-	cat arch/$(ARCH)/silo/silo.conf | $(SILO_CONF_FILTER) >$(TMP)/boot/silo.conf
-	cp arch/$(ARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
+	cat arch/$(BARCH)/silo/$(SILO_PACKAGE) | (cd $(TMP)/boot; tar xvfz -)
+	cp arch/$(BARCH)/silo/README arch/$(BARCH)/silo/COPYING $(TMP)/boot
+ifeq ($(CONFIG_RD_EXTERNAL),y)
+	cp arch/$(BARCH)/silo/silo.conf $(TMP)/boot/silo.conf
+else
+	cat arch/$(BARCH)/silo/silo.conf | grep -v initrd > $(TMP)/boot/silo.conf
+endif
+	cp arch/$(BARCH)/loader/image.boot $(TMP)/HelenOS/image.boot
 	gzip -f $(TMP)/HelenOS/image.boot
 ifeq ($(CONFIG_RD_EXTERNAL),y)
-	cp arch/$(ARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
+	cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
 endif
 	mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
 
 depend:
-	-rm arch/$(ARCH)/loader/image.boot
+	-rm arch/$(BARCH)/loader/image.boot
 
-arch/$(ARCH)/loader/image.boot:
-	$(MAKE) -C arch/$(ARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR) "DEFS=$(DEFS)"
+arch/$(BARCH)/loader/image.boot:
+	$(MAKE) -C arch/$(BARCH)/loader COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 
 clean: generic_clean
-	$(MAKE) -C arch/$(ARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
+	$(MAKE) -C arch/$(BARCH)/loader clean COMPILER=$(COMPILER) KERNELDIR=../../../$(KERNELDIR) USPACEDIR=../../../$(USPACEDIR)
 	-rm -fr $(TMP)
 	-rm -f $(BASE)/image.iso
Index: boot/arch/sparc64/loader/Makefile
===================================================================
--- boot/arch/sparc64/loader/Makefile	(revision fd375a8d1ed315622d230241a9b3227ec34ba99e)
+++ boot/arch/sparc64/loader/Makefile	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
@@ -28,5 +28,5 @@
 
 include ../../../../version
-include ../../../../Makefile.config
+-include ../../../../Makefile.config
 
 ## Toolchain configuration
@@ -58,13 +58,5 @@
 endif
 
-CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
-
-ifdef REVISION
-	CFLAGS += "-DREVISION=\"$(REVISION)\""
-endif
-
-ifdef TIMESTAMP
-	CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
-endif
+CFLAGS = -DRELEASE=$(RELEASE) -I. -I../../../generic -I../../../genarch -imacros ../../../../config.h -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64 -mno-fpu -pipe
 
 SOURCES = \
Index: boot/arch/sparc64/loader/main.c
===================================================================
--- boot/arch/sparc64/loader/main.c	(revision fd375a8d1ed315622d230241a9b3227ec34ba99e)
+++ boot/arch/sparc64/loader/main.c	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
@@ -37,4 +37,5 @@
 #include "ofwarch.h"
 #include <align.h>
+#include <macros.h>
 #include <string.h>
 
@@ -43,8 +44,8 @@
 component_t components[COMPONENTS];
 
-char *release = RELEASE;
+char *release = STRING(RELEASE);
 
 #ifdef REVISION
-	char *revision = ", revision " REVISION;
+	char *revision = ", revision " STRING(REVISION);
 #else
 	char *revision = "";
@@ -52,5 +53,5 @@
 
 #ifdef TIMESTAMP
-	char *timestamp = "\nBuilt on " TIMESTAMP;
+	char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
 	char *timestamp = "";
Index: boot/arch/sparc64/loader/ofwarch.c
===================================================================
--- boot/arch/sparc64/loader/ofwarch.c	(revision fd375a8d1ed315622d230241a9b3227ec34ba99e)
+++ boot/arch/sparc64/loader/ofwarch.c	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
@@ -33,5 +33,5 @@
  */
 
-#include <ofwarch.h>  
+#include <ofwarch.h>
 #include <ofw.h>
 #include <printf.h>