diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 977e8e1..c8ae861 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -1,4 +1,5 @@
 # Copyright (C) 2012 The CyanogenMod Project
+# Copyright (C) 2017-2018 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.
@@ -57,3 +58,6 @@ TARGET_RECOVERY_DEVICE_MODULES := libinit_msm8974
 
 # Time services
 BOARD_USES_QC_TIME_SERVICES := true
+
+# inherit from the proprietary version
+-include vendor/samsung/msm8974-common/BoardConfigVendor.mk
diff --git a/msm8974.mk b/msm8974.mk
index f473622..5487d58 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -1,4 +1,5 @@
 # Copyright (C) 2012 The CyanogenMod Project
+# Copyright (C) 2017-2018 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.
@@ -153,5 +154,8 @@ PRODUCT_PACKAGES += \
     wpa_supplicant \
     wpa_supplicant.conf
 
+# Get non-open-source specific aspects
+$(call inherit-product-if-exists, vendor/samsung/msm8974-common/msm8974-common-vendor.mk)
+
 # common msm8974
 $(call inherit-product, device/samsung/qcom-common/qcom-common.mk)