diff --git a/config/common_full.mk b/config/common_full.mk
index 22d25e15..51c39233 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -17,7 +17,8 @@ PRODUCT_PACKAGES += \
     PhotoTable \
     SoundRecorder \
     PhotoPhase \
-    CMSettingsProvider
+    CMSettingsProvider \
+    CMResolver
 
 # Extra tools in CM
 PRODUCT_PACKAGES += \
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index f2046880..e0e529a9 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -72,5 +72,9 @@
         <item>org.cyanogenmod.platform.internal.PartnerInterfaceService</item>
         <item>org.cyanogenmod.platform.internal.CMTelephonyManagerService</item>
         <item>org.cyanogenmod.platform.internal.CMHardwareService</item>
+        <item>org.cyanogenmod.platform.internal.AppSuggestManagerService</item>
     </string-array>
+
+    <!-- Enable custom resolver, so we can supply suggestions if nothing can handle the intent -->
+    <string name="config_customResolverActivity">org.cyanogenmod.resolver/org.cyanogenmod.resolver.ResolverActivity</string>
 </resources>
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index b1ba6f2d..eea1d811 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -8,3 +8,4 @@ profile                                   u:object_r:system_server_service:s0
 cmpartnerinterface                        u:object_r:system_server_service:s0
 cmtelephonymanager                        u:object_r:system_server_service:s0
 cmhardware                                u:object_r:system_server_service:s0
+cmappsuggest                              u:object_r:system_server_service:s0