diff --git a/ANDROID-DEV.md b/ANDROID-DEV.md
index 9b1c470e1..5eb67e7ac 100644
--- a/ANDROID-DEV.md
+++ b/ANDROID-DEV.md
@@ -750,7 +750,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| atari800 | Atari 800 | Atari800 | | Yes | |
| atarijaguar | Atari Jaguar | Virtual Jaguar | IrataJaguar **(Standalone)**,
MAME4droid 2024 **(Standalone)** | Yes for MAME4droid 2024 | Single archive or ROM file |
| atarijaguarcd | Atari Jaguar CD | _Placeholder_ | | | |
-| atarilynx | Atari Lynx | Handy | Beetle Lynx,
Lynx.emu **(Standalone)** | No | Single archive or ROM file |
+| atarilynx | Atari Lynx | Handy | Beetle Lynx,
Holani,
Lynx.emu **(Standalone)** | No | Single archive or ROM file |
| atarist | Atari ST [also STE and Falcon] | Hatari | | Yes | Single archive or image file for single-diskette games, .m3u playlist for multi-diskette games |
| atarixe | Atari XE | Atari800 | | Yes | |
| atomiswave | Sammy Corporation Atomiswave | Flycast | Flycast **(Standalone)** | Depends | Single archive file |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1eff8ed68..62e6a21ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,14 +9,17 @@
### Detailed list of changes
* Added translations for Traditional Chinese (zh_TW)
+* Added the Holani RetroArch core as an alternative emulator for the atarilynx system
* (Android) Added Pizza Boy SC standalone as an alternative emulator for the gamegear, genesis, mastersystem, megadrive and megadrivejp systems
* (Android) Changed all RetroArch core entries to use absolute paths (this makes the ancient Play store release work correctly)
* (Android) Changed the target SDK version to 35 (Android 15)
* (macOS) Added a build script to cross-compile for x86_64 using an ARM processor
+* Added support for building against libgit2 v1.9.0 and later
### Bug fixes
* The text element containerStartDelay timer was sometimes not reset which made vertical text scrolling start too early under some circumstances
+* The selectedItemOffset property did not work correctly for carousels with a single item
* Returning from a game when running in the background ignored the video element delay property for the first playback
## Version 3.1.1 / 3.1.1-39
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index 28abfae6e..baef625fd 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -4146,7 +4146,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| atari800 | Atari 800 | Atari800 | Atari800 **(Standalone)**,
Altirra **(Standalone)** [W] | Yes except for Altirra | |
| atarijaguar | Atari Jaguar | Virtual Jaguar | BigPEmu **(Standalone)** [LW],
BigPEmu **(Wine)** [L],
BigPEmu **(Proton)** [L],
MAME **(Standalone)** | Yes for MAME | See the specific _Atari Jaguar and Atari Jaguar CD_ section elsewhere in this guide |
| atarijaguarcd | Atari Jaguar CD | BigPEmu **(Standalone)** [LW] | BigPEmu **(Wine)** [L],
BigPEmu **(Proton)** [L] | No | See the specific _Atari Jaguar and Atari Jaguar CD_ section elsewhere in this guide |
-| atarilynx | Atari Lynx | Handy | Beetle Lynx,
Mednafen **(Standalone)** | No | Single archive or ROM file |
+| atarilynx | Atari Lynx | Handy | Beetle Lynx,
Mednafen **(Standalone)**,
Holani | No | Single archive or ROM file |
| atarist | Atari ST [also STE and Falcon] | Hatari | Hatari **(Standalone)** | Yes | Single archive or image file for single-diskette games, .m3u playlist for multi-diskette games |
| atarixe | Atari XE | Atari800 | Atari800 **(Standalone)**,
Altirra **(Standalone)** [W] | Yes except for Altirra | |
| atomiswave | Sammy Corporation Atomiswave | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Demul **(Standalone)** [W] | Depends | Single archive file |