diff --git a/config/common.mk b/config/common.mk
index 5587ac27..e9c91fe5 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -213,7 +213,6 @@ endif
 # easy way to extend to add more packages
 -include vendor/extra/product.mk
 
-PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
 PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common
 
 PRODUCT_VERSION_MAJOR = 11
diff --git a/config/common_full.mk b/config/common_full.mk
index 3be12a52..2eccc56b 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -7,6 +7,9 @@ $(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
 # Include CM audio files
 include vendor/cm/config/cm_audio.mk
 
+# Include CM LatinIME dictionaries
+PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
+
 # Optional CM packages
 PRODUCT_PACKAGES += \
     Galaxy4 \
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/values/gesture-input.xml b/overlay/common/packages/inputmethods/LatinIME/java/res/values/gesture-input.xml
similarity index 100%
rename from overlay/dictionaries/packages/inputmethods/LatinIME/java/res/values/gesture-input.xml
rename to overlay/common/packages/inputmethods/LatinIME/java/res/values/gesture-input.xml