diff --git a/config/telephony.mk b/config/telephony.mk
index 6adf48d9..be414ed5 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -1,3 +1,8 @@
+# GMS
+ifeq ($(WITH_GMS),true)
+WITH_GMS_COMMS_SUITE := true
+endif
+
 # Sensitive Phone Numbers list
 PRODUCT_PACKAGES += \
     sensitive_pn.xml