diff --git a/platform/galileo/Makefile.galileo b/platform/galileo/Makefile.galileo
index 1a2238370..9aca3d0a8 100644
--- a/platform/galileo/Makefile.galileo
+++ b/platform/galileo/Makefile.galileo
@@ -13,15 +13,12 @@ CONTIKI_CPU=$(CONTIKI)/cpu/x86
 include $(CONTIKI)/cpu/x86/Makefile.x86_quarkX1000
 
 CFLAGS += -fno-stack-protector -nostdinc -isystem $(LIBC)/include -isystem $(LIBGCC_PATH)/include -isystem $(LIBGCC_PATH)/include-fixed
-LDFLAGS += -nostdlib
+LDFLAGS += -nostdlib -L$(LIBC)/lib -L$(LIBGCC_PATH)/32
+
+TARGET_LIBFILES += -lm -lc -lgcc
 
 -include $(LIBC_PATH)/Makefile.libc
 
 ifndef BUILT_LIBC
   $(error Build the C library by executing $(LIBC_PATH)/build_newlib.sh)
 endif
-
-# 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
-# and we get undefined references only.
-TARGET_LIBFILES = $(LIBC)/lib/libm.a $(LIBC)/lib/libc.a $(LIBGCC_PATH)/32/libgcc.a