diff --git a/target/product/aosp_base_telephony.mk b/target/product/aosp_base_telephony.mk
index f326a0015..0d4e33356 100644
--- a/target/product/aosp_base_telephony.mk
+++ b/target/product/aosp_base_telephony.mk
@@ -14,3 +14,6 @@
 # limitations under the License.
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
+PRODUCT_PACKAGES += \
+    messaging
diff --git a/target/product/telephony.mk b/target/product/telephony.mk
index 084f86c30..919d0240f 100644
--- a/target/product/telephony.mk
+++ b/target/product/telephony.mk
@@ -21,7 +21,6 @@ PRODUCT_PACKAGES := \
     CarrierConfig \
     Dialer \
     CallLogBackup \
-    Mms \
     rild
 
 PRODUCT_COPY_FILES := \