diff --git a/common-proprietary-files.txt b/common-proprietary-files.txt
new file mode 100644
index 0000000..ccf22a4
--- /dev/null
+++ b/common-proprietary-files.txt
@@ -0,0 +1,25 @@
+-app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk:PRESIGNED
+-app/GoogleExtShared/GoogleExtShared.apk:PRESIGNED
+
+-priv-app/ConfigUpdater/ConfigUpdater.apk:PRESIGNED
+-priv-app/GoogleBackupTransport/GoogleBackupTransport.apk:PRESIGNED
+-priv-app/GoogleExtServices/GoogleExtServices.apk:PRESIGNED
+-priv-app/GoogleFeedback/GoogleFeedback.apk:PRESIGNED
+-priv-app/GoogleLoginService/GoogleLoginService.apk:PRESIGNED
+-priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk:PRESIGNED
+-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:PRESIGNED
+-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:PRESIGNED
+-priv-app/Phonesky/Phonesky.apk:PRESIGNED
+
+-framework/com.google.android.maps.jar:PRESIGNED
+-framework/com.google.android.media.effects.jar:PRESIGNED
+-framework/com.google.widevine.software.drm.jar:PRESIGNED
+
+etc/permissions/com.google.android.maps.xml
+etc/permissions/com.google.android.media.effects.xml
+etc/permissions/com.google.widevine.software.drm.xml
+etc/permissions/com.android.omadm.service.xml
+
+etc/sysconfig/google.xml
+etc/sysconfig/google_build.xml
+etc/sysconfig/whitelist_com.android.omadm.service.xml
diff --git a/extract-files.sh b/extract-files.sh
new file mode 100755
index 0000000..d896e0a
--- /dev/null
+++ b/extract-files.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+
+export GAPPS_COMMON=common
+export VENDOR=gapps
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
+
+CM_ROOT="$MY_DIR"/../..
+
+HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
+if [ ! -f "$HELPER" ]; then
+    echo "Unable to find helper script at $HELPER"
+    exit 1
+fi
+. "$HELPER"
+
+while [ "$1" != "" ]; do
+    case $1 in
+        -p | --path )           shift
+                                SRC=$1
+                                ;;
+        -t | --target )         shift
+                                export TARGET=$1
+    esac
+    shift
+done
+
+if [ -z "$SRC" ]; then
+    echo "Warning, path to system dump not specified, pulling from adb"
+    SRC=adb
+fi
+
+if [ -z "$TARGET" ]; then
+    echo "Warning, target for extraction not specified, defaulting to arm"
+    TARGET=arm
+fi
+
+# Initialize the helper for common gapps
+setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT"
+
+extract "$MY_DIR"/common-proprietary-files.txt "$SRC"
+
+# Reinitialize the helper for target gapps
+setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT"
+
+extract "$MY_DIR"/proprietary-files-$TARGET.txt "$SRC"
+extract "$MY_DIR"/proprietary-files.txt "$SRC"
+
+"$MY_DIR"/setup-makefiles.sh
diff --git a/proprietary-files-arm.txt b/proprietary-files-arm.txt
new file mode 100644
index 0000000..bcd14d1
--- /dev/null
+++ b/proprietary-files-arm.txt
@@ -0,0 +1 @@
+lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
diff --git a/proprietary-files-arm64.txt b/proprietary-files-arm64.txt
new file mode 100644
index 0000000..8619d80
--- /dev/null
+++ b/proprietary-files-arm64.txt
@@ -0,0 +1,2 @@
+lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
+lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d
diff --git a/proprietary-files-x86.txt b/proprietary-files-x86.txt
new file mode 100644
index 0000000..640792b
--- /dev/null
+++ b/proprietary-files-x86.txt
@@ -0,0 +1 @@
+lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79
diff --git a/proprietary-files.txt b/proprietary-files.txt
new file mode 100644
index 0000000..0d780e9
--- /dev/null
+++ b/proprietary-files.txt
@@ -0,0 +1,2 @@
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED
+-priv-app/SetupWizard/SetupWizard.apk:PRESIGNED
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
new file mode 100755
index 0000000..c4863cc
--- /dev/null
+++ b/setup-makefiles.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017 The LineageOS Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
+
+CM_ROOT="$MY_DIR"/../..
+
+HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
+if [ ! -f "$HELPER" ]; then
+    echo "Unable to find helper script at $HELPER"
+    exit 1
+fi
+. "$HELPER"
+
+# Initialize the helper for common gapps
+setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT"
+
+# Copyright headers
+write_headers
+
+# Common gapps
+write_makefiles "$MY_DIR"/common-proprietary-files.txt
+
+# We are done with common
+write_footers
+
+# Reinitialize the helper for target gapps
+setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT"
+
+# Copyright headers and guards
+write_headers
+
+write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
+write_makefiles "$MY_DIR"/proprietary-files.txt
+
+# We are done with target
+write_footers