diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 2a95997..db89ed1 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,7 +16,8 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_comet.mk \
-    $(LOCAL_DIR)/factory_comet.mk
+    $(LOCAL_DIR)/factory_comet.mk \
+    $(LOCAL_DIR)/lineage_comet.mk
 
 COMMON_LUNCH_CHOICES := \
     aosp_comet-trunk_staging-userdebug
diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
new file mode 100644
index 0000000..eadedb9
--- /dev/null
+++ b/BoardConfigLineage.mk
@@ -0,0 +1,5 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk
index 3223bed..74a8d58 100644
--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -39,3 +39,6 @@ else
 include device/google/comet23/comet23/BoardConfig.mk
 
 endif
+
+DEVICE_PATH := device/google/comet
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
diff --git a/comet/BoardConfigLineage.mk b/comet/BoardConfigLineage.mk
new file mode 100644
index 0000000..996f8be
--- /dev/null
+++ b/comet/BoardConfigLineage.mk
@@ -0,0 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigLineage.mk
diff --git a/comet/device-lineage.mk b/comet/device-lineage.mk
new file mode 100644
index 0000000..fd82a16
--- /dev/null
+++ b/comet/device-lineage.mk
@@ -0,0 +1,9 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
diff --git a/device-lineage.mk b/device-lineage.mk
new file mode 100644
index 0000000..dc6adb4
--- /dev/null
+++ b/device-lineage.mk
@@ -0,0 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage
diff --git a/lineage_comet.mk b/lineage_comet.mk
new file mode 100644
index 0000000..8304294
--- /dev/null
+++ b/lineage_comet.mk
@@ -0,0 +1,30 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Inherit some common stuff
+TARGET_DISABLE_EPPE := true
+$(call inherit-product, vendor/lineage/config/common_full_foldable_book_telephony.mk)
+
+# Inherit device configuration
+DEVICE_CODENAME := comet
+DEVICE_PATH := device/google/comet
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/zumapro/lineage_common.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+
+# Device identifier. This must come after all inclusions
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Pixel 9 Pro Fold
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2424
+TARGET_SCREEN_WIDTH := 1080
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BuildDesc="comet-user 15 AP3A.241005.015 12366759 release-keys" \
+    BuildFingerprint=google/comet/comet:15/AP3A.241005.015/12366759:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)