diff --git a/proprietary-files.txt b/proprietary-files.txt
index 03340a0..71d8334 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -326,7 +326,7 @@ vendor/etc/seccomp_policy/imsrtp.policy
 -vendor/lib64/vendor.qti.ims.rcsconfig@2.0.so
 -vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so
 -vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
--vendor/lib64/vendor.qti.imsrtpservice@3.0.so
+-vendor/lib64/vendor.qti.imsrtpservice@3.0.so;MODULE_SUFFIX=_vendor
 
 # IPA
 vendor/etc/init/ipa_fws.rc
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 9a3a255..0a8b853 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -33,6 +33,27 @@ function vendor_imports() {
 EOF
 }
 
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        vendor.qti.imsrtpservice@3.0)
+            echo "$1_vendor"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_vendor_variants "$@"
+}
+
 # Initialize the helper for common
 setup_vendor "${DEVICE_COMMON}" "${VENDOR_COMMON:-$VENDOR}" "${ANDROID_ROOT}" true