diff --git a/device/testing/device-oneplus-enchilada/APKBUILD b/device/testing/device-oneplus-enchilada/APKBUILD
new file mode 100644
index 000000000..aa559c64a
--- /dev/null
+++ b/device/testing/device-oneplus-enchilada/APKBUILD
@@ -0,0 +1,24 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Caleb Connolly <caleb@connolly.tech>
+
+pkgname=device-oneplus-enchilada
+pkgdesc="OnePlus 6"
+pkgver=0.1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="postmarketos-base linux-oneplus-sdm845 mkbootimg mesa-dri-gallium"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="ce061f1a55d4982a11ecde1272398e9c756baed748ccaa254fc574ab4c12083f40797a1058c8d0521461acb85255f4b4c3a42d4fc863f36306d2243b5bdb03c2  deviceinfo"
diff --git a/device/testing/device-oneplus-enchilada/deviceinfo b/device/testing/device-oneplus-enchilada/deviceinfo
new file mode 100644
index 000000000..ac22b4c1a
--- /dev/null
+++ b/device/testing/device-oneplus-enchilada/deviceinfo
@@ -0,0 +1,37 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="OnePlus 6"
+deviceinfo_manufacturer="OnePlus"
+deviceinfo_codename="oneplus-enchilada"
+deviceinfo_year="2018"
+deviceinfo_modules_initfs=""
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2280"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_flash_sparse="true"
+
+# Kernel options
+deviceinfo_dtb="qcom/sdm845-oneplus-enchilada"
+deviceinfo_append_dtb="true"
+
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"