diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1b4ef97f..127f52182 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
# EmulationStation Desktop Edition (ES-DE) - Changelog
+## Version 2.1.1
+
+**Release date:** 2023-07-16
+
+### Release overview
+
+2.1 maintenance release. This mostly fixes a regression where some arcade controller boards stopped working, but it also includes a few other minor changes.
+
+### Detailed list of changes
+
+* Added support for a lot more emoji characters by bundling the Google Noto Emoji font
+* Changed the media viewer to using linear interpolation scaling for the miximages
+* (Linux) Added ~/.local/share/applications/ as an additional search path for AppImages and manually downloaded emulators
+
+### Bug fixes
+
+* The crash prevention for buggy controller drivers was a bit too aggressive and stopped some arcade controller boards from working
+
## Version 2.1.0
**Release date:** 2023-07-13
diff --git a/CREDITS.md b/CREDITS.md
index 92c48cb92..83c3cb0b3 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -108,6 +108,9 @@ https://www.gnu.org/software/freefont
Nanum font \
https://hangeul.naver.com
+Noto Emoji \
+https://fonts.google.com/noto/specimen/Noto+Emoji
+
Ubuntu font \
https://design.ubuntu.com/font
diff --git a/README.md b/README.md
index 5d72832af..8a9d3c9e8 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Two theme sets (Slate and Modern) are bundled with the application, and addition
## Download
-The latest stable version is **2.1.0** (released 2023-07-13)
+The latest stable version is **2.1.1** (released 2023-07-16)
Visit https://es-de.org/ to download ES-DE or go to the [package registry](https://gitlab.com/es-de/emulationstation-de/-/packages) where you can also find all previous releases.
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index 17d6ec9e2..eca145aed 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -582,14 +582,14 @@ As this release of RetroArch is executed via the Steam application it's behaving
As well, adding support for the Steam release of RetroArch for all systems that ES-DE supports requires hundreds of additional alternative emulator entries. For all these reasons there will be no official support for this release of RetroArch. If you insist on still using it, it's however quite easy to make [custom system configuration](USERGUIDE-DEV.md#game-system-customizations) entries as the setup has been partly prepared in the bundled configuration.
Simply add alternative emulator entries such as the following example (which enables support for the Nestopia UE core for the nes system):
-```
+```xml
%RUNINBACKGROUND% %EMULATOR_STEAM% -applaunch 1118310 -L nestopia_libretro %ROM%
```
This will work on both Linux and Windows.
A complete entry for the nes system could look like the following:
-```
+```xml
nes
Nintendo Entertainment System
@@ -610,6 +610,7 @@ Therefore all bundled emulator configuration entries that support AppImages will
```
~/Applications/
+~/.local/share/applications/
~/.local/bin/
~/bin/
```
@@ -671,6 +672,7 @@ To clarify with an example, this is what the find rule entry for the Dolphin emu
~/Applications/Dolphin_Emulator*.AppImage
+ ~/.local/share/applications/Dolphin_Emulator*.AppImage
~/.local/bin/Dolphin_Emulator*.AppImage
~/bin/Dolphin_Emulator*.AppImage
/var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu
@@ -704,6 +706,7 @@ Normally on Linux you would install emulators using either one of the establishe
For these situations ES-DE looks for emulators in the same directories where it looks for AppImages (as explained in the section above), meaning:
```
~/Applications/
+~/.local/share/applications/
~/.local/bin/
~/bin/
```
diff --git a/USERGUIDE.md b/USERGUIDE.md
index d128b7501..1b2572514 100644
--- a/USERGUIDE.md
+++ b/USERGUIDE.md
@@ -580,14 +580,14 @@ As this release of RetroArch is executed via the Steam application it's behaving
As well, adding support for the Steam release of RetroArch for all systems that ES-DE supports requires hundreds of additional alternative emulator entries. For all these reasons there will be no official support for this release of RetroArch. If you insist on still using it, it's however quite easy to make [custom system configuration](USERGUIDE.md#game-system-customizations) entries as the setup has been partly prepared in the bundled configuration.
Simply add alternative emulator entries such as the following example (which enables support for the Nestopia UE core for the nes system):
-```
+```xml
%RUNINBACKGROUND% %EMULATOR_STEAM% -applaunch 1118310 -L nestopia_libretro %ROM%
```
This will work on both Linux and Windows.
A complete entry for the nes system could look like the following:
-```
+```xml
nes
Nintendo Entertainment System
@@ -608,6 +608,7 @@ Therefore all bundled emulator configuration entries that support AppImages will
```
~/Applications/
+~/.local/share/applications/
~/.local/bin/
~/bin/
```
@@ -669,6 +670,7 @@ To clarify with an example, this is what the find rule entry for the Dolphin emu
~/Applications/Dolphin_Emulator*.AppImage
+ ~/.local/share/applications/Dolphin_Emulator*.AppImage
~/.local/bin/Dolphin_Emulator*.AppImage
~/bin/Dolphin_Emulator*.AppImage
/var/lib/flatpak/exports/bin/org.DolphinEmu.dolphin-emu
@@ -702,6 +704,7 @@ Normally on Linux you would install emulators using either one of the establishe
For these situations ES-DE looks for emulators in the same directories where it looks for AppImages (as explained in the section above), meaning:
```
~/Applications/
+~/.local/share/applications/
~/.local/bin/
~/bin/
```