diff --git a/docs/admin-manual/stream-configuration.md b/docs/admin-manual/stream-configuration.md
index b4043d8ea..609b708bb 100644
--- a/docs/admin-manual/stream-configuration.md
+++ b/docs/admin-manual/stream-configuration.md
@@ -28,10 +28,18 @@ When sending metadata about your stream to an Icecast server in non-Latin alphab
 The solution is to specify that the metadata for the MP3 mount point you are using should be interpreted using UTF-8 encoding. You can do this by adding the following stanza to the `/etc/icecast2/icecast.xml` file, where `libretime.mp3` is the name of your mount point:
 
 ```xml
-<mount>
-  <mount-name>/libretime.mp3</mount-name>
-  <charset>UTF-8</charset>
-</mount>
+     <mount type="normal">
+          <mount-name>/libretime.mp3</mount-name>
+          <charset>UTF-8</charset>
+     </mount>
+```
+
+Or if you want to default to UTF-8 for all the mount points:
+
+```xml
+    <mount type="default">
+        <charset>UTF-8</charset>
+    </mount>
 ```
 
 After saving the `/etc/icecast2/icecast.xml` file, restart the Icecast server with `sudo systemctl restart icecast2`.
diff --git a/docs/releases/unreleased.md b/docs/releases/unreleased.md
index 18bad9f26..9406fc288 100644
--- a/docs/releases/unreleased.md
+++ b/docs/releases/unreleased.md
@@ -26,6 +26,27 @@ Please follow this **before the upgrade procedure**.
 
 ## :arrow_up: Upgrading
 
+### Icecast mount default charset
+
+During the first installation, the installer will configure Icecast to use UTF-8 as default charset for mounts. To upgrade an existing installation, you may want to manually apply the changes in the `/etc/icecast2/icecast.xml`:
+
+```xml
+    <mount type="default">
+        <charset>UTF-8</charset>
+    </mount>
+```
+
+Or if only want to set the charset to UTF-8 for specific mounts (for example `/main.mp3`):
+
+```xml
+    <mount type="normal">
+        <mount-name>/main.mp3</mount-name>
+        <charset>UTF-8</charset>
+    </mount>
+```
+
+Please, see the [documentation for more details](../admin-manual/stream-configuration.md#utf-8-metadata-in-icecast-mp3-streams).
+
 ## :warning: Known issues
 
 The following issues may need a workaround for the time being. Please search the [issues](https://github.com/libretime/libretime/issues) before reporting problems not listed below.
diff --git a/install b/install
index 438650862..0de5a8e24 100755
--- a/install
+++ b/install
@@ -556,6 +556,10 @@ if $LIBRETIME_SETUP_ICECAST; then
   if $is_first_install; then
     icecast_config_filepath="/etc/icecast2/icecast.xml"
 
+    cp_if_different \
+      "${SCRIPT_DIR}/installer/icecast/icecast.xml" \
+      "$icecast_config_filepath"
+
     sed --in-place \
       -e "s|<admin-password>[^<]*</admin-password>|<admin-password>${LIBRETIME_ICECAST_ADMIN_PASSWORD}</admin-password>|" \
       -e "s|<source-password>[^<]*</source-password>|<source-password>${LIBRETIME_ICECAST_SOURCE_PASSWORD}</source-password>|" \
diff --git a/installer/icecast/icecast.xml b/installer/icecast/icecast.xml
index a7e28962e..277adeb8d 100644
--- a/installer/icecast/icecast.xml
+++ b/installer/icecast/icecast.xml
@@ -142,6 +142,9 @@
         </http-headers>
     </mount>
     -->
+    <mount type="default">
+        <charset>UTF-8</charset>
+    </mount>
 
     <!-- Normal mounts -->
     <!--