diff --git a/cpu/x86/Makefile.x86 b/cpu/x86/Makefile.x86_common
similarity index 81%
rename from cpu/x86/Makefile.x86
rename to cpu/x86/Makefile.x86_common
index 4cb49df37..ca14d0c96 100644
--- a/cpu/x86/Makefile.x86
+++ b/cpu/x86/Makefile.x86_common
@@ -1,14 +1,14 @@
-CONTIKI_CPU_DIRS = . drivers/legacy_pc
+CONTIKI_CPU_DIRS += .
 
-CONTIKI_SOURCEFILES += gdt.c helpers.S idt.c cpu.c rtc.c pit.c pic.c
+CONTIKI_SOURCEFILES += gdt.c helpers.S idt.c cpu.c
 
-### Compiler definitions
 CC       = gcc
 LD       = gcc
 AS       = as
 OBJCOPY  = objcopy
 SIZE     = size
 STRIP    = strip
+
 CFLAGSNO = -Wall -g -I/usr/local/include
 CFLAGS  += $(CFLAGSNO)
 ifeq ($(HOST_OS),Linux)
diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/cpu/x86/Makefile.x86_quarkX1000
new file mode 100644
index 000000000..01f206d66
--- /dev/null
+++ b/cpu/x86/Makefile.x86_quarkX1000
@@ -0,0 +1,5 @@
+include $(CONTIKI)/cpu/x86/Makefile.x86_common
+
+CONTIKI_CPU_DIRS += drivers/legacy_pc
+
+CONTIKI_SOURCEFILES += rtc.c pit.c pic.c
diff --git a/platform/galileo/Makefile.galileo b/platform/galileo/Makefile.galileo
index 15f693401..9d186f8c5 100644
--- a/platform/galileo/Makefile.galileo
+++ b/platform/galileo/Makefile.galileo
@@ -8,7 +8,7 @@ CONTIKI_SOURCEFILES += contiki-main.c newlib-syscalls.c loader.S clock.c rtimer-
 LINKERSCRIPT = $(CONTIKI)/platform/galileo/galileo.ld
 
 CONTIKI_CPU=$(CONTIKI)/cpu/x86
-include $(CONTIKI)/cpu/x86/Makefile.x86
+include $(CONTIKI)/cpu/x86/Makefile.x86_quarkX1000
 
 CFLAGS += -m32 -march=i586 -nostdinc -isystem $(LIBC)/include -isystem $(LIBGCC_PATH)/include -isystem $(LIBGCC_PATH)/include-fixed
 LDFLAGS += -m32 -nostdlib -T $(LINKERSCRIPT)