diff --git a/config/common.mk b/config/common.mk
index 1f61780..927442d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -150,8 +150,7 @@
     LockClock \
     CMUpdater \
     CMFota \
-    CMAccount \
-    WhisperPush
+    CMAccount
 
 # CM Hardware Abstraction Framework
 PRODUCT_PACKAGES += \
diff --git a/config/telephony.mk b/config/telephony.mk
index 5f35a4a..cd21f2d 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -6,7 +6,8 @@
 PRODUCT_COPY_FILES += \
     vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
 
-# SIM Toolkit
+# Telephony packages
 PRODUCT_PACKAGES += \
     Mms \
-    Stk
+    Stk \
+    WhisperPush