diff --git a/Makefile b/Makefile
index 4654489..1693cd8 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump
 # Define the flags we'll need for our tools
 INCLUDES = -I include -I arch/$(ARCH)/include
 KCFLAGS = -g -Wall -Wextra -Werror -nostdlib -nostartfiles -fno-builtin -std=gnu99 $(ARCH_KCFLAGS) -include config.h $(INCLUDES)
-KLDFLAGS = -T arch/$(ARCH)/kernel.ld -L /usr/lib/gcc/arm-elf/4.7.0/ $(ARCH_KLDFLAGS)
+KLDFLAGS = -T arch/$(ARCH)/kernel.ld $(ARCH_KLDFLAGS)
 EXTRA_LIBS = $(ARCH_EXTRA_LIBS)
 
 # Include the config file so we don't compile/link unnecessary objects
diff --git a/arch/arm/kernel.mk b/arch/arm/kernel.mk
index b2b748b..e92a3a2 100644
--- a/arch/arm/kernel.mk
+++ b/arch/arm/kernel.mk
@@ -4,8 +4,8 @@ SUBDIRS := kernel
 include $(BASEDIR)/header.mk
 
 # Architecture-specific definitions
-CROSS_COMPILE ?= arm-elf-
-ARCH_KCFLAGS =
+CROSS_COMPILE ?= arm-none-eabi-
+ARCH_KLDFLAGS = -L /usr/lib/gcc/arm-none-eabi/4.9.1
 ARCH_EXTRA_LIBS = -lgcc
 
 OBJS_$(d) := $(d)/start.o