diff --git a/build/Makefile b/build/Makefile
index 5ff62f56b1c9da0e7a2223435e0a534dcb3e4d3b..14bcccbf25ea071ca150baeb9bbbd0c9fe7be1b8 100755
--- a/build/Makefile
+++ b/build/Makefile
@@ -3,13 +3,17 @@
 all: x86_64
 
 x86_64: x.c util.c
-	build-diet.sh x86-64
-	gcc -nostdlib -static -fomit-frame-pointer -L./dietlibc/bin ./dietlibc/bin-arm/start.o -o x $^ -isystem ./dietlibc/include -D__dietlibc__ ./dietlibc/bin-arm/dietlibc.a -lgcc ./dietlibc/bin-arm/dietlibc.a
+	./build-diet.sh x86_64
+	gcc -nostdlib -static -fomit-frame-pointer -L./dietlibc/bin-$@ ./dietlibc/bin-$@/start.o -o x $^ -isystem ./dietlibc/include -D__dietlibc__ ./dietlibc/bin-$@/dietlibc.a -lgcc ./dietlibc/bin-$@/dietlibc.a
 
 i386: x.c util.c
-	build-diet.sh i386
-	gcc -nostdlib -static -fomit-frame-pointer -L./dietlibc/bin-arm ./dietlibc/bin-arm/start.o -o x $^ -isystem ./dietlibc/include -D__dietlibc__ ./dietlibc/bin-arm/dietlibc.a -lgcc ./dietlibc/bin-arm/dietlibc.a
+	./build-diet.sh i386
+	gcc -nostdlib -static -fomit-frame-pointer -L./dietlibc/bin-$@ ./dietlibc/bin-$@/start.o -o x $^ -isystem ./dietlibc/include -D__dietlibc__ ./dietlibc/bin-$@/dietlibc.a -lgcc ./dietlibc/bin-$@/dietlibc.a
 
 arm: x.c util.c
-	build-diet.sh arm
-	arm-linux-gnueabihf-gcc -nostdlib -static -fomit-frame-pointer -L./dietlibc/bin-arm ./dietlibc/bin-arm/start.o -o x $^ -isystem ./dietlibc/include -D__dietlibc__ ./dietlibc/bin-arm/dietlibc.a -lgcc ./dietlibc/bin-arm/dietlibc.a
+	./build-diet.sh arm
+	arm-linux-gnueabihf-gcc -nostdlib -static -fomit-frame-pointer -L./dietlibc/bin-$@ ./dietlibc/bin-$@/start.o -o x $^ -isystem ./dietlibc/include -D__dietlibc__ ./dietlibc/bin-$@/dietlibc.a -lgcc ./dietlibc/bin-$@/dietlibc.a
+
+clean:
+	make -C ./dietlibc clean
+	rm x
diff --git a/src/util.h b/src/util.h
index 754310818cc5095037343b47eb9b7fed0c00f3a3..bbeb50a952a07c2c9e165dee20de9f8de8555acc 100644
--- a/src/util.h
+++ b/src/util.h
@@ -22,5 +22,5 @@ void * (*prepare_kernel_cred)(void *);
 void set_root_creds(void) ;
 unsigned long get_kernel_sym(char *name);
 unsigned long *find_kernel_base(void);
- 
+
 #endif