diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index c42ccde28..d3115ae8c 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -6,6 +6,7 @@ This file documents all notable changes to https://github.com/devonfw/IDEasy[IDE
 
 Release with new features and bugfixes:
 
+* https://github.com/devonfw/IDEasy/issues/589[#589]: Fix NLS Bundles for Linux and MacOS
 * https://github.com/devonfw/IDEasy/issues/764[#764]: IDEasy not working properly in CMD
 * https://github.com/devonfw/IDEasy/issues/754[#754]: Again messages break processable command output
 
diff --git a/cli/pom.xml b/cli/pom.xml
index 9e8fe6bc7..3b9bd19d7 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -209,7 +209,6 @@
               <imageName>${imageName}</imageName>
               <buildArgs>
                 <arg>--enable-url-protocols=http,https</arg>
-                <arg>-H:IncludeResources="nls/.*"</arg>
                 <arg>--initialize-at-build-time=org.apache.commons</arg>
               </buildArgs>
             </configuration>
diff --git a/cli/src/main/resources/META-INF/native-image/com.devonfw.tools.IDEasy/ide-cli/resource-config.json b/cli/src/main/resources/META-INF/native-image/com.devonfw.tools.IDEasy/ide-cli/resource-config.json
new file mode 100644
index 000000000..fbd60b774
--- /dev/null
+++ b/cli/src/main/resources/META-INF/native-image/com.devonfw.tools.IDEasy/ide-cli/resource-config.json
@@ -0,0 +1,7 @@
+{
+  "resources": {
+    "includes": [
+      {"pattern": "nls/.*"}
+    ]
+  }
+}