diff --git a/build/target/product/AndroidProducts.mk b/build/target/product/AndroidProducts.mk
index 636738a2..a53a22d2 100644
--- a/build/target/product/AndroidProducts.mk
+++ b/build/target/product/AndroidProducts.mk
@@ -26,7 +26,9 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/lineage_tv_arm.mk \
     $(LOCAL_DIR)/lineage_tv_arm64.mk \
     $(LOCAL_DIR)/lineage_tv_x86.mk \
-    $(LOCAL_DIR)/lineage_tv_x86_64.mk
+    $(LOCAL_DIR)/lineage_tv_x86_64.mk \
+    $(LOCAL_DIR)/lineage_car_arm64.mk \
+    $(LOCAL_DIR)/lineage_car_x86_64.mk
 
 COMMON_LUNCH_CHOICES := \
     lineage_arm-userdebug \
@@ -40,4 +42,6 @@ COMMON_LUNCH_CHOICES := \
     lineage_tv_arm-userdebug \
     lineage_tv_arm64-userdebug \
     lineage_tv_x86-userdebug \
-    lineage_tv_x86_64-userdebug
+    lineage_tv_x86_64-userdebug \
+    lineage_car_arm64-userdebug \
+    lineage_car_x86_64-userdebug
diff --git a/build/target/product/lineage_car_arm64.mk b/build/target/product/lineage_car_arm64.mk
new file mode 100644
index 00000000..aa386c7c
--- /dev/null
+++ b/build/target/product/lineage_car_arm64.mk
@@ -0,0 +1,21 @@
+# Copyright (C) 2018-2020 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.
+
+include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
+
+TARGET_NO_KERNEL_OVERRIDE := true
+
+PRODUCT_NAME := lineage_car_arm64
diff --git a/build/target/product/lineage_car_x86_64.mk b/build/target/product/lineage_car_x86_64.mk
new file mode 100644
index 00000000..821a9204
--- /dev/null
+++ b/build/target/product/lineage_car_x86_64.mk
@@ -0,0 +1,19 @@
+# Copyright (C) 2018-2020 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.
+
+include vendor/lineage/build/target/product/lineage_generic_car_target.mk
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
+
+PRODUCT_NAME := lineage_car_x86_64
diff --git a/build/target/product/lineage_generic_car_target.mk b/build/target/product/lineage_generic_car_target.mk
new file mode 100644
index 00000000..60bb2da7
--- /dev/null
+++ b/build/target/product/lineage_generic_car_target.mk
@@ -0,0 +1,22 @@
+# Copyright (C) 2019-2020 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.
+
+$(call inherit-product, vendor/lineage/config/common_car.mk)
+$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk)
+
+EMULATOR_VENDOR_NO_SENSORS := true
+EMULATOR_VENDOR_NO_SOUND := true
+
+# Allow building otatools
+TARGET_FORCE_OTA_PACKAGE := true
diff --git a/config/common_car.mk b/config/common_car.mk
new file mode 100644
index 00000000..05c1f5b6
--- /dev/null
+++ b/config/common_car.mk
@@ -0,0 +1,8 @@
+# Inherit common Lineage stuff
+$(call inherit-product, vendor/lineage/config/common.mk)
+
+# Inherit Lineage car device tree
+$(call inherit-product, device/lineage/car/lineage_car.mk)
+
+# Inherit the main AOSP car makefile that turns this into an Automotive build
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)