diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8f7a5fb..d9a896b 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -125,6 +125,10 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 
 
 TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common
+
+# Define kernel config for inline building
+TARGET_KERNEL_CONFIG := htcleo_defconfig
+
 TARGET_PREBUILT_KERNEL := device/htc/leo/prebuilt/kernel
 
 # to enable the GPS HAL
diff --git a/leo.mk b/leo.mk
index d2a691b..943c6a5 100644
--- a/leo.mk
+++ b/leo.mk
@@ -228,30 +228,10 @@ PRODUCT_COPY_FILES += \
 	device/htc/leo/prebuilt/ppp/ppp:system/ppp \
 	device/htc/leo/prebuilt/ppp/options:system/etc/ppp/options
 
-# Kernel Modules
-PRODUCT_COPY_FILES += $(shell \
-	find device/htc/leo/prebuilt/modules -name '*.ko' \
-	| sed -r 's/^\/?(.*\/)([^/ ]+)$$/\1\2:system\/lib\/modules\/\2/' \
-	| tr '\n' ' ')
-
-# kernel
-PRODUCT_COPY_FILES += \
-	device/htc/leo/prebuilt/kernel:kernel
-
-ifeq ($(TARGET_PREBUILT_KERNEL),)
-	LOCAL_KERNEL := device/htc/leo/prebuilt/kernel
-else
-	LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
-endif
-
 # The gps config appropriate for this device
 PRODUCT_COPY_FILES += \
 	device/htc/leo/prebuilt/gps.conf:system/etc/gps.conf
 
-PRODUCT_COPY_FILES += \
-	$(LOCAL_KERNEL):kernel
-
-
 # stuff common to all HTC phones
 $(call inherit-product, device/htc/common/common.mk)