diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128678db7..59e384a72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -159,6 +159,7 @@ v1.2 maintenance release.
 
 * Added experimental support for Vita3K for the psvita system on Unix and Windows
 * Added support for the Fujitsu FM Towns (fmtowns) game system on Unix and Windows
+* Added support for the Adobe Flash (flash) game system
 * Added support for the EasyRPG game engine (easyrpg) game system
 * Added support for the Creatronic Mega Duck (megaduck) game system
 * Added support for the Watara Supervision (supervision) game system
@@ -168,7 +169,7 @@ v1.2 maintenance release.
 * Added emulator configuration for the macintosh system
 * Added emulator configuration for the solarus system
 * Added Mednafen standalone as an alternative emulator for many systems
-* Added PCSX2 Qt standalone as an alternative emulator for the ps2 system on Unix
+* Added PCSX2 Qt standalone as an alternative emulator for the ps2 system on Unix and macOS
 * Added ScummVM standalone as an alternative emulator for the scummvm system
 * Added Cxbx-Reloaded standalone as an alternative emulator for the xbox system on Windows
 * Added Atari800 standalone as an alternative emulator for the a5200 system
@@ -180,6 +181,7 @@ v1.2 maintenance release.
 * Added connection and transfer timeout settings to the scraper (not configurable via the GUI)
 * Added an es_log.txt entry when the "Only show ROMs from gamelist.xml files" setting is enabled
 * Passing the --ignore-gamelist command line option now immediately disables the ParseGamelistOnly setting
+* (Windows) Added code signing to both the application binary and installer
 * (macOS) Improved Apple compliance for the Info.plist file
 * (rbsimple-DE) Added console graphics for the psvita system
 
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index dbef203eb..1ad627d93 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -626,7 +626,6 @@ The following emulators are supported in AppImage format when using the bundled
 | System name  | Emulator    | Filename configuration                   |
 | :----------- | :---------- | :--------------------------------------- |
 | _Multiple_   | RetroArch   | RetroArch-Linux-x86_64.AppImage          |
-| easyrpg      | EasyRPG     | easyrpg/easyrpg-player                   |
 | gba          | mGBA        | mGBA*.AppImage                           |
 | gc           | Dolphin     | Dolphin_Emulator*.AppImage               |
 | macintosh    | Basilisk II | BasiliskII-x86_64.AppImage               |
@@ -661,9 +660,11 @@ The following manually downloaded emulators are supported when using the bundled
 
 | System name  | Emulator      | Filename configuration          |
 | :----------- | :------------ | :------------------------------ |
+| apple2       | LinApple      | linapple/linapple               |
 | daphne       | Hypseus Singe | hypseus-singe/hypseus.bin       |
 | dreamcast    | Redream       | redream/redream                 |
-| apple2       | LinApple      | linapple/linapple               |
+| easyrpg      | EasyRPG       | easyrpg/easyrpg-player          |
+| flash        | Ruffle        | ruffle/ruffle                   |
 | fmtowns      | Tsugaru       | tsugaru/Tsugaru_CUI             |
 | oric         | Oricutron     | oricutron/Oricutron             |
 | pico8        | PICO-8        | pico-8/pico8                    |
@@ -2812,6 +2813,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
 | fba                   | FinalBurn Alpha                                | FB Alpha 2012                     | FB Alpha 2012 Neo Geo,<br>FB Alpha 2012 CPS-1,<br>FB Alpha 2012 CPS-2,<br>FB Alpha 2012 CPS-3 | Yes          | Single archive file following MAME name standard in root folder |
 | fbneo                 | FinalBurn Neo                                  | FinalBurn Neo                     |                                   | Yes          | Single archive file following MAME name standard in root folder |
 | fds                   | Nintendo Famicom Disk System                   | Mesen                             | Nestopia UE,<br>Nestopia UE **(Standalone)** [U],<br>FCEUmm,<br>Mednafen **(Standalone)** [UMW*] | Yes          | Single archive or ROM file in root folder |
+| flash                 | Adobe Flash                                    | Ruffle **(Standalone)** [UMW*]    | ArcadeFlashWeb **(Standalone)** [W*] | No        | Single .swf file in root folder      |
 | fmtowns               | Fujitsu FM Towns                               | Tsugaru **(Standalone)** [UW*]    |                                   | Yes          | See the specific _Fujitsu FM Towns_ section elsewhere in this guide |
 | gameandwatch          | Nintendo Game and Watch                        | GW                                |                                   |              |                                      |
 | gamegear              | Sega Game Gear                                 | Genesis Plus GX                   | Genesis Plus GX Wide,<br>Gearsystem,<br>SMS Plus GX,<br>Mednafen **(Standalone)** [UMW*] |              |                                      |