diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/Makefile b/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/Makefile
new file mode 100644
index 000000000..fbde0884d
--- /dev/null
+++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/Makefile
@@ -0,0 +1,43 @@
+## NON_GPL module (rsi_client.ko)
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/OSD/LINUX/client/ganges_client_init.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_802.11d.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_802.11h.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_fsm.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_ioctl.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_mgmt.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_osi_data.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_osi_dev_ops.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_power.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/OSI/ganges_generic.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/WLAN/WLAN_OS/LINUX/ganges_linux_functional.o
+CLIENT_OBJS += RS.GENR.LNX.SD_NON_GPL/HAL/OSI/SDIO/ganges_sdio_specific.o
+
+## GPL module (rsi_master.ko)
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/OSD/LINUX/master/ganges_linux_main.o
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/OSD/LINUX/master/ganges_master_init.o
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/OSD/LINUX/master/ganges_linux_master_ops.o
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/OSD/LINUX/master/ganges_linux_specific.o
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/OSD/LINUX/master/ganges_linux_osd_data.o
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/OSD/LINUX/master/ganges_parser.o
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/OSD/LINUX/master/ganges_linux_ioctl.o
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/HAL/SDIO/LINUX/master/ganges_linux_sdio.o
+MASTER_OBJS += RS.GENR.LNX.SD_GPL/OSD/LINUX/master/digi_hal.o
+
+EXTRA_CFLAGS += -DLINUX -DUSE_SDIO_INTF
+
+obj-m := rsi_client.o rsi_master.o
+rsi_client-y := $(CLIENT_OBJS)
+rsi_master-y := $(MASTER_OBJS)
+
+SRC := $(shell pwd)
+
+FIRMWARE := $(addprefix $(SRC)/RS.GENR.LNX.SD_GPL/OSD/LINUX/release/, instructionSet tadm taim)
+
+all:
+	$(MAKE) -C $(KERNEL_SRC) M=$(SRC)
+
+modules_install:
+	$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install
+	# Install firmware
+	mkdir -p $(INSTALL_MOD_PATH)/lib/firmware/redpine
+	install -m 0644 $(FIRMWARE) $(INSTALL_MOD_PATH)/lib/firmware/redpine/
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
index a9dd7a1e3..e5d72af16 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
@@ -6,48 +6,20 @@ inherit module
 
 PR = "r0"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRCREV = "${AUTOREV}"
 SRC_URI = "${DIGI_LOG_GIT}linux-modules/redpine.git;protocol=git;branch=refs/heads/master \
 	  file://0001-redpine-allow-to-build-with-gcc-4.7.patch \
+	  file://Makefile \
 	  file://redpine"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "-C ${STAGING_KERNEL_DIR}"
-EXTRAMAKEFLAGS = "M=${S} CONFIG_DEL_KMOD_REDPINE=y"
-
-module_do_compile() {
-        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
-                   KERNEL_SRC=${STAGING_KERNEL_DIR}    \
-                   KERNEL_VERSION=${KERNEL_VERSION}    \
-                   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-                   AR="${KERNEL_AR}" \
-		   ${EXTRAMAKEFLAGS} \
-                   ${MAKE_TARGETS}
+do_configure_prepend() {
+	cp ${WORKDIR}/Makefile ${S}/
 }
 
-module_do_install() {
-        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-        oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \
-                   KERNEL_SRC=${STAGING_KERNEL_DIR} \
-                   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
-		   ${EXTRAMAKEFLAGS} \
-                   modules_install
-}
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install -m 0755 ${WORKDIR}/redpine  ${D}${sysconfdir}/network/if-pre-up.d/
-	install -d ${D}/lib/firmware/redpine
-	install -m 0755 ${S}/RS.GENR.LNX.SD_GPL/OSD/LINUX/release/tadm ${D}/lib/firmware/redpine/
-	install -m 0755 ${S}/RS.GENR.LNX.SD_GPL/OSD/LINUX/release/taim ${D}/lib/firmware/redpine/
-	install -m 0755 ${S}/RS.GENR.LNX.SD_GPL/OSD/LINUX/release/instructionSet ${D}/lib/firmware/redpine/
-}
-
-FILES_${PN} += " /lib/firmware/redpine/tadm \
+FILES_${PN} += "/lib/firmware/redpine/tadm \
 		/lib/firmware/redpine/taim \
-		/lib/firmware/redpine/instructionSet "
+		/lib/firmware/redpine/instructionSet"
 
 COMPATIBLE_MACHINE = "(ccimx51js|ccimx53js)"