diff --git a/Kbuild b/Kbuild
new file mode 100644
index 0000000..54f66da
--- /dev/null
+++ b/Kbuild
@@ -0,0 +1,23 @@
+obj-m       += rtw89pci.o
+rtw89pci-y  := pci.o
+
+obj-m       += rtw89core.o
+rtw89core-y += \
+	core.o \
+	debug.o \
+	mac80211.o \
+	mac.o \
+	phy.o \
+	fw.o \
+	rtw8852a.o \
+	rtw8852a_table.o \
+	rtw8852a_rfk.o \
+	rtw8852a_rfk_table.o \
+	cam.o \
+	efuse.o \
+	regd.o \
+	coex.o \
+	ps.o \
+	sar.o \
+	ser.o \
+	util.o
diff --git a/Makefile b/Makefile
index a10b3f1..5e23b68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,84 +1,27 @@
-SHELL := /bin/sh
-KVER  ?= $(shell uname -r)
-KSRC := /lib/modules/$(KVER)/build
-FIRMWAREDIR := /lib/firmware/
-PWD := $(shell pwd)
+include Kbuild
+KERNELRELEASE	?= `uname -r`
+KERNEL_DIR	?= /lib/modules/$(KERNELRELEASE)/build
+PWD		:= $(shell pwd)
+
 CLR_MODULE_FILES := *.mod.c *.mod *.o .*.cmd *.ko *~ .tmp_versions* modules.order Module.symvers
 SYMBOL_FILE := Module.symvers
-# Handle the move of the entire rtw88 tree
-ifneq ("","$(wildcard /lib/modules/$(KVER)/kernel/drivers/net/wireless/realtek)")
-MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/realtek/rtw89
-else
-MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/rtw89
-endif
-#Handle the compression option for modules in 3.18+
-ifneq ("","$(wildcard $(MODDESTDIR)/*.ko.gz)")
-COMPRESS_GZIP := y
-endif
-ifneq ("","$(wildcard $(MODDESTDIR)/*.ko.xz)")
-COMPRESS_XZ := y
-endif
 
 EXTRA_CFLAGS += -O2
 EXTRA_CFLAGS += -DCONFIG_RTW89_DEBUGMSG
 EXTRA_CFLAGS += -DCONFIG_RTW89_DEBUGFS
 
-obj-m += rtw89core.o
-rtw89core-y +=  core.o \
-		debug.o \
-		mac80211.o \
-		mac.o \
-		phy.o \
-		fw.o \
-		rtw8852a.o \
-		rtw8852a_table.o \
-		rtw8852a_rfk.o \
-		rtw8852a_rfk_table.o \
-		cam.o \
-		efuse.o \
-		regd.o \
-		coex.o \
-		ps.o \
-		sar.o \
-		ser.o \
-		util.o
-
-obj-m += rtw89pci.o
-rtw89pci-y := pci.o
-
 ccflags-y += -D__CHECK_ENDIAN__
 
-all: 
-	$(MAKE) -C $(KSRC) M=$(PWD) modules
-install: all
-	@rm -f $(MODDESTDIR)/rtw89*.ko
-
-	@mkdir -p $(MODDESTDIR)
-	@install -p -D -m 644 *.ko $(MODDESTDIR)	
-ifeq ($(COMPRESS_GZIP), y)
-	@gzip -f $(MODDESTDIR)/*.ko
-endif
-ifeq ($(COMPRESS_XZ), y)
-	@xz -f $(MODDESTDIR)/*.ko
-endif
-	@depmod -a $(KVER)
-
-	@mkdir -p /lib/firmware/rtw89/
-	cp *.bin /lib/firmware/rtw89/.
-
-	@echo "Install rtw89 SUCCESS"
+all: modules
 
-uninstall:
-	@rm -f $(MODDESTDIR)/rtw89.ko
+modules:
+	@echo "Building rtw89 driver"
+	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules
 
-	@depmod -a
-	
-	@echo "Uninstall rtw89 SUCCESS"
+install: modules
+	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install
 
 clean:
-	@rm -fr *.mod.c *.mod *.o .*.cmd .*.o.cmd *.ko *~ .*.o.d .cache.mk
-	@rm -fr .tmp_versions
-	@rm -fr Modules.symvers
-	@rm -fr Module.symvers
-	@rm -fr Module.markers
-	@rm -fr modules.order
+	rm -f *~
+	rm -f Module.symvers Module.markers modules.order
+	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) clean