diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55120fde8..e7e020a0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ All notable changes to this project will be documented in this file.
 - [#2315] AS3 direct editation - switching scripts during editation causing missing scripts
 - [#2316] AS3 direct editation - private classes
 - [#2317] AS3 direct editation - local register names colliding with parameter names
+- [#2330] Windows EXE launcher (+ CLI) does not respect current working directory
 
 ## [21.0.5] - 2024-09-05
 ### Fixed
@@ -3628,6 +3629,7 @@ Major version of SWF to XML export changed to 2.
 [#2315]: https://www.free-decompiler.com/flash/issues/2315
 [#2316]: https://www.free-decompiler.com/flash/issues/2316
 [#2317]: https://www.free-decompiler.com/flash/issues/2317
+[#2330]: https://www.free-decompiler.com/flash/issues/2330
 [#2293]: https://www.free-decompiler.com/flash/issues/2293
 [#2294]: https://www.free-decompiler.com/flash/issues/2294
 [#2299]: https://www.free-decompiler.com/flash/issues/2299
diff --git a/README.md b/README.md
index 23a2e9c2d..45560e84a 100644
--- a/README.md
+++ b/README.md
@@ -54,14 +54,12 @@ To only build, execute build task:
 ```
 ant build
 ```
-For creating EXE, Installer and ZIP version, there exist Ant tasks "exe","installer","release". These tasks require additional software installed:
-* [launch4j] (3.5 or newer) - creates windows executable
+For creating EXE Installer and ZIP version, there exist Ant tasks "installer","release". These tasks require additional software installed:
 * [NSIS] (Nullsoft Scriptable Install System) (3.0b3 or newer) - creates installer
 
-You must configure installation path of these tools in tools.properties file, which could look like this for windows:
+You must configure installation path of this tool in tools.properties file, which could look like this for windows:
 ```
 nsis.path = c:\\program files (x86)\\NSIS
-launch4j.path = c:\\program files (x86)\\launch4j
 ```
 ### Building libraries
 
@@ -159,13 +157,15 @@ And links also these libraries:
 
 Application uses also some icons of the [Silk icons pack], [Silk companion 1], [FatCow icons pack] and [Aha-Soft icons pack].
 
+For EXE launchers we use [Launch5j] - MIT.
+
 ## Library
 See [library README](libsrc/ffdec_lib/README.md) for more info about FFDec library.
 
 [GIT]: http://git-scm.com/downloads
 [Netbeans IDE]: http://www.netbeans.org/
 [Apache Ant]: http://ant.apache.org/
-[launch4j]: http://launch4j.sourceforge.net/
+[Launch5j]: https://github.com/lordmulder/Launch5j
 [NSIS]: http://nsis.sourceforge.net/
 [JSyntaxPane]: https://code.google.com/p/jsyntaxpane/
 [Java Native Access - JNA]: https://github.com/twall/jna
diff --git a/resources/ffdec-cli.exe b/resources/ffdec-cli.exe
index c098934e8..47a33fca5 100644
Binary files a/resources/ffdec-cli.exe and b/resources/ffdec-cli.exe differ
diff --git a/resources/ffdec.exe b/resources/ffdec.exe
index 52975b8b2..af55aeaa2 100644
Binary files a/resources/ffdec.exe and b/resources/ffdec.exe differ