diff --git a/BoardConfig.mk b/BoardConfig.mk
index 416048c..5c2585d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -43,7 +43,8 @@ TARGET_OTA_ASSERT_DEVICE := nx,nx_tab
 TARGET_BOARD_INFO_FILE := device/nintendo/nx/board-info.txt
 
 # Manifest
-DEVICE_MANIFEST_FILE := device/nintendo/nx/manifest.xml
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += device/nintendo/nx/manifests/device_framework_matrix.xml
+DEVICE_MANIFEST_FILE := device/nintendo/nx/manifests/manifest.xml
 
 # Bluetooth
 TARGET_VENDOR_PROP += device/nintendo/nx/bluetooth.prop
diff --git a/manifests/device_framework_matrix.xml b/manifests/device_framework_matrix.xml
new file mode 100644
index 0000000..2a3e53b
--- /dev/null
+++ b/manifests/device_framework_matrix.xml
@@ -0,0 +1,10 @@
+<compatibility-matrix version="1.0" type="framework" level="5">
+    <hal format="aidl">
+        <name>android.hardware.nintendo.joycond</name>
+        <version>1</version>
+        <interface>
+            <name>IJoycond</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
diff --git a/manifest.xml b/manifests/manifest.xml
similarity index 100%
rename from manifest.xml
rename to manifests/manifest.xml