diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 4e3457eb..790af925 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -179,6 +179,9 @@ else
 TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom
 endif
 
+# Releasetools
+TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH)
+
 # RIL
 PROTOBUF_SUPPORTED := true
 ENABLE_VENDOR_RIL_SERVICE := true
diff --git a/releasetools.py b/releasetools.py
new file mode 100644
index 00000000..62fce3e6
--- /dev/null
+++ b/releasetools.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2009 The Android Open Source Project
+# Copyright (c) 2011, The Linux Foundation. All rights reserved.
+# Copyright (C) 2019 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.
+
+import hashlib
+import common
+import re
+
+def FullOTA_InstallEnd(info):
+  input_zip = info.input_zip
+  OTA_InstallEnd(info, input_zip)
+  return
+
+def IncrementalOTA_InstallEnd(info):
+  input_zip = info.target_zip
+  OTA_InstallEnd(info, input_zip)
+  return
+
+def AddImage(info, input_zip, basename, dest):
+  name = basename
+  path = "IMAGES/" + name
+  if path not in input_zip.namelist():
+    return
+
+  data = input_zip.read(path)
+  common.ZipWriteStr(info.output_zip, basename, data)
+  info.script.AppendExtra('package_extract_file("%s", "%s");' % (basename, dest))
+
+def OTA_InstallEnd(info, input_zip):
+  info.script.Print("Patching device-tree and verity images...")
+  AddImage(info, input_zip, "vbmeta.img", "/dev/block/bootdevice/by-name/vbmeta")
+  return
\ No newline at end of file