diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..216555e
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,18 @@
+## Changelog
+
+### v2.1.1 (alpha-2)
+
+- Auto-updating
+- WUX rom support
+- Improved support for VC (Virtual Console) RPX roms
+- Gamepad control changes
+- Moved to API v2
+- Misc bug fixes
+- Backend support for multiple Cemu/Decaf versions (No frontend components added)
+- Backend support for multiple game folders (No frontend components added)
+- Improved suggestions (API side only)
+
+### v2.0.0 (alpha-1)
+
+- Complete rewrite
+- Initial file upload
\ No newline at end of file
diff --git a/FAQ.md b/FAQ.md
new file mode 100644
index 0000000..e69de29
diff --git a/README.md b/README.md
index 9c7f412..63dc758 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,12 @@ We **always** welcome suggestions and Pull Requests! This program is written in
 
 **If you have a suggestion, and do not know any of the required languages, you can reach us on our [Discord server][1]**
 
+# Changelog & FAQ
+### [Changelog](https://github.com/RedDuckss/CemUI/blob/master/CHANGELOG.md)
+
+### [FAQ](https://github.com/RedDuckss/CemUI/blob/master/FAQ.md)
+
+
 # How to get the latest version of CemUI
 To get CemUI v2.0 right now, you must build from source. To do this, follow these steps: