diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8512d5e..099bb86 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -49,6 +49,8 @@ WIFI_DRIVER_FW_AP_PATH      := "/vendor/firmware/fw_bcm4329_apsta.bin"
 WIFI_DRIVER_MODULE_ARG      := "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/proc/calibration"
 WIFI_DRIVER_MODULE_NAME     := "bcm4329"
 
+BOARD_KERNEL_CMDLINE := no_console_suspend=1 msmsdcc_sdioirq=1 wire.search_count=5
+
 BOARD_USES_GENERIC_AUDIO := false
 
 BOARD_KERNEL_CMDLINE := no_console_suspend=1
diff --git a/kernel b/kernel
deleted file mode 100755
index b52872d..0000000
Binary files a/kernel and /dev/null differ
diff --git a/leo.mk b/leo.mk
index 445a868..18855dd 100755
--- a/leo.mk
+++ b/leo.mk
@@ -111,7 +111,6 @@ PRODUCT_PACKAGES += \
     copybit.qsd8k \
     leo-reference-ril \
     gps.leo \
-    leo-reference-ril \
     libOmxCore \
     libOmxVidEnc 
 
@@ -135,14 +134,6 @@ PRODUCT_COPY_FILES += \
     device/htc/leo/firmware/fw_bcm4329_apsta.bin:system/etc/firmware/fw_bcm4329_apsta.bin
 
 
-ifeq ($(TARGET_PREBUILT_KERNEL),)
-LOCAL_KERNEL := device/htc/leo/kernel
-else
-LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
-endif
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_KERNEL):kernel
 
 PRODUCT_COPY_FILES += \
     device/htc/leo/modules/bcm4329.ko:system/lib/modules/bcm4329.ko \
@@ -153,7 +144,7 @@ PRODUCT_COPY_FILES += \
     device/htc/leo/modules/tun.ko:system/lib/modules/tun.ko
 
 PRODUCT_COPY_FILES += \
-    device/htc/leo/zImage.ko:boot/zImage \
+    device/htc/leo/zImage:boot/zImage \
     device/htc/leo/initrd.gz:boot/initrd.gz \
 
 # media profiles and capabilities spec
diff --git a/modules/bcm4329.ko b/modules/bcm4329.ko
index 9f01488..595333a 100644
Binary files a/modules/bcm4329.ko and b/modules/bcm4329.ko differ
diff --git a/modules/cifs.ko b/modules/cifs.ko
index 7fc3e21..816497f 100644
Binary files a/modules/cifs.ko and b/modules/cifs.ko differ
diff --git a/modules/fuse.ko b/modules/fuse.ko
index e74662a..2da1de1 100644
Binary files a/modules/fuse.ko and b/modules/fuse.ko differ
diff --git a/modules/msm_rmnet.ko b/modules/msm_rmnet.ko
index c98fd40..7dfb5f5 100644
Binary files a/modules/msm_rmnet.ko and b/modules/msm_rmnet.ko differ
diff --git a/modules/nls_utf8.ko b/modules/nls_utf8.ko
index 5364e34..73c65ce 100644
Binary files a/modules/nls_utf8.ko and b/modules/nls_utf8.ko differ
diff --git a/modules/tun.ko b/modules/tun.ko
index 9ac1423..ddd90a6 100644
Binary files a/modules/tun.ko and b/modules/tun.ko differ
diff --git a/ueventd.leo.rc b/ueventd.leo.rc
new file mode 100644
index 0000000..dcb9db5
--- /dev/null
+++ b/ueventd.leo.rc
@@ -0,0 +1,2 @@
+mtd@misc 0460 radio diag
+
diff --git a/zImage b/zImage
index 92173b0..adee006 100755
Binary files a/zImage and b/zImage differ