diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4102866
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+proprietary/product/priv-app/Messages/Messages.apk
+proprietary/product/priv-app/GmsCore/GmsCore.apk
+proprietary/product/priv-app/Velvet/Velvet.apk
+proprietary/product/app/TrichromeLibrary64/TrichromeLibrary64.apk
+proprietary/product/app/Gmail2/Gmail2.apk
+proprietary/product/app/Photos/Photos.apk
diff --git a/extract-files.sh b/extract-files.sh
index 8a5600d..7d7af46 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -53,6 +53,14 @@ if [ -z "${SRC}" ]; then
     SRC="adb"
 fi
 
+function blob_fixup() {
+    case "${1}" in
+        product/priv-app/Messages/Messages.apk | product/priv-app/GmsCore/GmsCore.apk | product/priv-app/Velvet/Velvet.apk | product/app/TrichromeLibrary64/TrichromeLibrary64.apk | product/app/Gmail2/Gmail2.apk | product/app/Photos/Photos.apk )
+            split --bytes=49M -d "$2" "$2".part
+            ;;
+    esac
+}
+
 # Initialize the helper.
 setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 
diff --git a/vendorsetup.sh b/vendorsetup.sh
new file mode 100644
index 0000000..ef53a60
--- /dev/null
+++ b/vendorsetup.sh
@@ -0,0 +1,7 @@
+# Merge GMS blobs
+cat vendor/google/gms/proprietary/product/priv-app/Messages/Messages.apk.part* > vendor/google/gms/proprietary/product/priv-app/Messages/Messages.apk
+cat vendor/google/gms/proprietary/product/priv-app/GmsCore/GmsCore.apk.part* > vendor/google/gms/proprietary/product/priv-app/GmsCore/GmsCore.apk
+cat vendor/google/gms/proprietary/product/priv-app/Velvet/Velvet.apk.part* > vendor/google/gms/proprietary/product/priv-app/Velvet/Velvet.apk
+cat vendor/google/gms/proprietary/product/app/TrichromeLibrary64/TrichromeLibrary64.apk.part* > vendor/google/gms/proprietary/product/app/TrichromeLibrary64/TrichromeLibrary64.apk
+cat vendor/google/gms/proprietary/product/app/Gmail2/Gmail2.apk.part* > vendor/google/gms/proprietary/product/app/Gmail2/Gmail2.apk
+cat vendor/google/gms/proprietary/product/app/Photos/Photos.apk.part* > vendor/google/gms/proprietary/product/app/Photos/Photos.apk