diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
index 630d33804..d6a258453 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -4,4 +4,6 @@ CONTIKI_CPU_DIRS += drivers/legacy_pc init/legacy_pc
 
 CONTIKI_SOURCEFILES += bootstrap_quarkX1000.S rtc.c pit.c pic.c irq.c nmi.c
 
-LINKERSCRIPT = $(CONTIKI)/cpu/x86/quarkX1000.ld
+CFLAGS += -m32 -march=i586 -mtune=i586
+LDFLAGS += -m32 -T $(CONTIKI)/cpu/x86/quarkX1000.ld
+ASFLAGS += --32 -march=i586 -mtune=i586
diff --git a/platform/galileo/Makefile.galileo b/platform/galileo/Makefile.galileo
index 3fbe88e8f..fcff32cdd 100644
--- a/platform/galileo/Makefile.galileo
+++ b/platform/galileo/Makefile.galileo
@@ -8,9 +8,8 @@ CONTIKI_SOURCEFILES += contiki-main.c newlib-syscalls.c clock.c rtimer-arch.c
 CONTIKI_CPU=$(CONTIKI)/cpu/x86
 include $(CONTIKI)/cpu/x86/Makefile.x86_quarkX1000
 
-CFLAGS += -m32 -march=i586 -mtune=i586 -fno-stack-protector -nostdinc -isystem $(LIBC)/include -isystem $(LIBGCC_PATH)/include -isystem $(LIBGCC_PATH)/include-fixed
-LDFLAGS += -m32 -nostdlib -T $(LINKERSCRIPT)
-ASFLAGS += --32 -march=i586 -mtune=i586
+CFLAGS += -fno-stack-protector -nostdinc -isystem $(LIBC)/include -isystem $(LIBGCC_PATH)/include -isystem $(LIBGCC_PATH)/include-fixed
+LDFLAGS += -nostdlib
 
 # Ideally, this should be part of LDFLAGS (-lc -lm etc). However, we found out that archive
 # static files (.a) must be linked after our own object files, otherwise the linker gets lost