diff --git a/Android.mk b/Android.mk
index 96c4520..d9bbb76 100755
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),htcleo)
+
 LOCAL_PATH := $(my-dir)
 subdir_makefiles := \
 	$(LOCAL_PATH)/libreference-ril/Android.mk \
@@ -21,3 +23,5 @@ subdir_makefiles := \
 	$(LOCAL_PATH)/libhtc_ril_wrapper/Android.mk
 
 include $(subdir_makefiles)
+
+endif
diff --git a/leo.mk b/leo.mk
index ba39705..38968ea 100755
--- a/leo.mk
+++ b/leo.mk
@@ -95,13 +95,13 @@ PRODUCT_COPY_FILES += \
     device/htc/leo/media_profiles.xml:system/etc/media_profiles.xml
 
 PRODUCT_PACKAGES += \
-    sensors.$(TARGET_BOOTLOADER_BOARD_NAME) \
-    lights.$(TARGET_BOOTLOADER_BOARD_NAME) \
+    sensors.htcleo \
+    lights.htcleo \
     librs_jni \
     gralloc.qsd8k \
     copybit.qsd8k \
     leo-reference-ril \
-    gps.$(TARGET_BOOTLOADER_BOARD_NAME) \
+    gps.htcleo \
     libgps \
     libhtc_ril_wrapper