diff --git a/BoardConfig.mk b/BoardConfig.mk
index b13c582..620ed94 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 include device/samsung/exynos9820-common/BoardConfigPlatform.mk
+include vendor/samsung/beyond1lte/BoardConfigVendor.mk
 
 DEVICE_PATH := device/samsung/beyond1lte
 
diff --git a/device.mk b/device.mk
index 68bc1c9..789a7b2 100644
--- a/device.mk
+++ b/device.mk
@@ -17,7 +17,7 @@
 ### PLATFORM
 $(call inherit-product, device/samsung/exynos9820-common/platform.mk)
 ### PROPRIETARY VENDOR FILES
-#$(call inherit-product, vendor/samsung/beyond1lte/beyond1lte-vendor.mk)
+$(call inherit-product, vendor/samsung/beyond1lte/beyond1lte-vendor.mk)
 
 ### DALVIK
 $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
diff --git a/extract-files.sh b/extract-files.sh
new file mode 100755
index 0000000..15221f8
--- /dev/null
+++ b/extract-files.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# If we're being sourced by the common script that we called,
+# stop right here. No need to go down the rabbit hole.
+if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+    return
+fi
+
+set -e
+
+export DEVICE=beyond1lte
+export DEVICE_COMMON=exynos9820-common
+export VENDOR=samsung
+
+"./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/lineage_beyond1lte.mk b/lineage_beyond1lte.mk
index 4256aa9..37fe699 100644
--- a/lineage_beyond1lte.mk
+++ b/lineage_beyond1lte.mk
@@ -46,6 +46,12 @@ PRODUCT_PDA_MODEL_VERSION := XXU9FUBD
 PRODUCT_PDA_VERSION := $(PRODUCT_PDA_MODEL)$(PRODUCT_PDA_MODEL_VERSION)
 PRODUCT_GMS_CLIENTID_BASE := android-samsung
 
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    PRODUCT_NAME=beyond1ltexx \
+    PRIVATE_BUILD_DESC="beyond1ltexx-user 11 RP1A.200720.012 $(PRODUCT_PDA_VERSION) release-keys"
+
+BUILD_FINGERPRINT := samsung/beyond1ltexx/beyond1:11/RP1A.200720.012/$(PRODUCT_PDA_VERSION):user/release-keys
+
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.build.PDA=$(PRODUCT_PDA_VERSION)
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
new file mode 100644
index 0000000..d45e13d
--- /dev/null
+++ b/proprietary-files.txt
@@ -0,0 +1,86 @@
+# Proprietary files - from Samsung package version G973FXXU9FUBD, unless pinned
+
+### AUDIO
+vendor/etc/floating_feature.xml
+vendor/etc/mixer_gains.xml
+vendor/lib/librecordalive.so
+
+### AUDIO_FIRMWARE
+vendor/firmware/APBargeIn_AUDIO_SLSI.bin
+vendor/firmware/APBiBF_AUDIO_SLSI.bin
+vendor/firmware/APDV_AUDIO_SLSI.bin
+vendor/firmware/APSV_AUDIO_SLSI.bin
+vendor/firmware/AP_AUDIO_SLSI.bin
+vendor/firmware/SoundBoosterParam.bin
+
+### BIOMETRICS_FINGERPRINT
+vendor/lib/libbauthserver.so
+vendor/lib/libbauthtzcommon.so
+vendor/lib64/libbauthserver.so
+vendor/lib64/libbauthtzcommon.so
+
+### BLUETOOTH_FIRMWARE
+vendor/firmware/bcm4375B0_murata.hcd
+vendor/firmware/bcm4375B0_semco.hcd
+vendor/firmware/bcm4375B1_murata.hcd
+vendor/firmware/bcm4375B1_semco.hcd
+vendor/firmware/bcm4375B1_semco_sem.hcd
+
+### CAMERA
+vendor/lib/hw/camera.exynos9820.so
+vendor/lib64/hw/camera.exynos9820.so
+
+### CAMERA_DEPENDENCIES
+vendor/lib/libexynoscamera3.so
+vendor/lib64/libexynoscamera3.so
+
+### GPS/GNSS
+vendor/lib64/libwrappergps.so
+
+### OMX_FIRMWARE
+vendor/firmware/fimc_is_lib.bin
+vendor/firmware/fimc_is_rta.bin
+
+### RIL
+vendor/bin/secril_config_svc
+vendor/etc/init/init.baseband.rc
+vendor/lib/libsec-ril.so
+vendor/lib/libsec-ril-dsds.so
+vendor/lib64/libsec-ril.so
+vendor/lib64/libsec-ril-dsds.so
+
+### SAMSUNG_SLSI_HWC
+vendor/lib/libexynosdisplay.so
+vendor/lib64/libexynosdisplay.so
+
+### SAMSUNG_SLSI_FIRMWARE
+vendor/firmware/cs35l40-bot-dsp1-spk-prot-calib.bin
+vendor/firmware/cs35l40-bot-dsp1-spk-prot.bin
+vendor/firmware/cs35l40-rcv-dsp1-spk-prot-calib.bin
+vendor/firmware/cs35l40-rcv-dsp1-spk-prot.bin
+vendor/firmware/fimc_is_fw_mcu.bin
+vendor/firmware/setfile_2l4.bin
+vendor/firmware/setfile_3m3.bin
+vendor/firmware/setfile_3p9.bin
+
+### SENSORS
+vendor/lib/sensors.bio.so
+vendor/lib/sensors.sensorhub.so
+vendor/lib64/sensors.bio.so
+vendor/lib64/sensors.sensorhub.so
+
+### TEEGRIS_FIRMWARE
+vendor/tee/00000000-0000-0000-0000-00000000dead
+vendor/tee/00000000-0000-0000-0000-000000534b4d
+vendor/tee/00000000-0000-0000-0000-0053545354ab
+vendor/tee/00000000-0000-0000-0000-46494e474502
+vendor/tee/00000000-0000-0000-0000-4b45594d5354
+vendor/tee/00000000-0000-0000-0000-505256544545
+vendor/tee/00000000-0000-0000-0000-657365447276
+vendor/tee/driver/00000000-0000-0000-0000-53626f786476
+
+### WIFI
+vendor/firmware/bcmdhd_clm.blob
+vendor/firmware/nvram.txt_1rh_es43_b1
+vendor/firmware/nvram.txt_CS01_semco_b1
+vendor/firmware/nvram.txt_ES03_semco_b0
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
new file mode 100755
index 0000000..a39174a
--- /dev/null
+++ b/setup-makefiles.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+export DEVICE=beyond1lte
+export DEVICE_COMMON=exynos9820-common
+export VENDOR=samsung
+
+"./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"