diff --git a/CHANGELOG.md b/CHANGELOG.md
index 454f2f28760..a7fc541716b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Blocks of changes will separated by version increments.
 
 ## **[Unreleased]**
 
+- [#817](https://github.com/wasmerio/wasmer/pull/817) Add document for tracking features across backends and language integrations, [docs/feature_matrix.md]
 - [#823](https://github.com/wasmerio/wasmer/issues/823) Improved Emscripten / WASI integration
 - [#821](https://github.com/wasmerio/wasmer/issues/821) Remove patch version on most deps Cargo manifests.  This gives Wasmer library users more control over which versions of the deps they use.
 - [#820](https://github.com/wasmerio/wasmer/issues/820) Remove null-pointer checks in `WasmPtr` from runtime-core, re-add them in Emscripten
diff --git a/docs/feature_matrix.md b/docs/feature_matrix.md
new file mode 100644
index 00000000000..6931c38b4d4
--- /dev/null
+++ b/docs/feature_matrix.md
@@ -0,0 +1,26 @@
+# Feature Table
+
+## Compiler Backend
+
+|   | Singlepass | Cranelift | LLVM |
+| - | - | - | - |
+| Caching | ❌ | ✅ | ✅ |
+| Emscripten | ✅ | ✅ | ✅ |
+| Metering | ✅ | ❌ | ✅ |
+| Multi-value return | ❌ | ❌ | ❌ |
+| OSR | 🚧 | ❓ | ❓ |
+| SIMD | ❌ | ❌ | ✅ |
+| WASI | ✅ | ✅ | ✅ |
+
+
+## Language integration
+
+TODO: define a set of features that are relevant and mark them here
+
+Current ideas:
+
+- WASI FS API
+- Callbacks
+- Exiting early in hostcall
+- Metering
+- Caching