diff -Naur busybox-1.15.3/Makefile.flags busybox-1.15.3-magellan/Makefile.flags
--- busybox-1.15.3/Makefile.flags	2009-12-12 02:45:08.000000000 +0100
+++ busybox-1.15.3-magellan/Makefile.flags	2009-12-29 21:38:09.000000000 +0100
@@ -31,7 +31,7 @@
 # still possible to build bbox without warnings.
 
 ifeq ($(CONFIG_WERROR),y)
-CFLAGS += $(call cc-option,-Werror,)
+CFLAGS += $(call cc-option,,)
 ## TODO:
 ## gcc version 4.4.0 20090506 (Red Hat 4.4.0-4) (GCC) is a PITA:
 ## const char *ptr; ... off_t v = *(off_t*)ptr; -> BOOM
@@ -50,7 +50,7 @@
 # of branch probabilities (hopefully makes bloatcheck more stable):
 CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
 CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
-CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
+CFLAGS += $(call cc-option,,)
 
 # FIXME: These warnings are at least partially to be concerned about and should
 # be fixed..