diff --git a/extract-files.sh b/extract-files.sh
index dcfa531..b02366c 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -83,6 +83,9 @@ if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt
     setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 
     extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    extract "${MY_DIR}/../${DEVICE}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+    extract_carriersettings
 fi
 
 "${MY_DIR}/setup-makefiles.sh"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 42d49ce..1716e02 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -43,6 +43,9 @@ if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
     # The standard device blobs
     write_makefiles "${MY_DIR}/../${DEVICE}/proprietary-files.txt" true
 
+    write_rro_package "CarrierConfigOverlay" "com.android.carrierconfig" product
+    write_single_product_packages "CarrierConfigOverlay"
+
     # Finish
     write_footers
 fi