diff --git a/kernel/Makefile b/kernel/Makefile
index de4604b..2bfc021 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,12 +1,13 @@
 
-export LD       := i586-elf-ld
-export CC       := i586-elf-gcc
-export CXX      := i586-elf-g++
-export OBJDUMP  := i586-elf-objdump
+CROSS_COMPILE   := i586-elf-
+
+export LD       := $(CROSS_COMPILE)ld
+export CC       := $(CROSS_COMPILE)gcc
+export CXX      := $(CROSS_COMPILE)g++
+export OBJDUMP  := $(CROSS_COMPILE)objdump
 export NASM     := nasm
 
-WD              := $(shell pwd)
-export HOS_TOPLEVEL := $(WD)
+export HOS_TOPLEVEL := $(shell pwd)
 LDSCRIPT        := link.ld
 KERNEL          := hos
 export CPPFLAGS := -I$(HOS_TOPLEVEL) -I$(HOS_TOPLEVEL)/include