diff --git a/gradle/changelog/diff_encoding.yaml b/gradle/changelog/diff_encoding.yaml
new file mode 100644
index 0000000000..a36846b35f
--- /dev/null
+++ b/gradle/changelog/diff_encoding.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Character encoding in diffs ([#2046](https://github.com/scm-manager/scm-manager/pull/2046))
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
index 656329cac4..0b9dffd16e 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/DiffCommandBuilder.java
@@ -36,6 +36,7 @@ import sonia.scm.repository.spi.DiffCommandRequest;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Set;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -111,7 +112,7 @@ public final class DiffCommandBuilder extends AbstractDiffCommandBuilder<DiffCom
   public String getContent() throws IOException {
     try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
       getDiffResult().accept(baos);
-      return baos.toString();
+      return baos.toString(StandardCharsets.UTF_8);
     }
   }
 
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffResultCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffResultCommand.java
index c16c56005a..df287292ee 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffResultCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitDiffResultCommand.java
@@ -38,6 +38,7 @@ import sonia.scm.repository.api.Hunk;
 import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
@@ -184,7 +185,7 @@ public class GitDiffResultCommand extends AbstractGitCommand implements DiffResu
       try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); DiffFormatter formatter = new DiffFormatter(baos)) {
         formatter.setRepository(repository);
         formatter.format(entry);
-        return baos.toString();
+        return baos.toString(StandardCharsets.UTF_8);
       } catch (IOException ex) {
         throw new InternalRepositoryException(GitDiffResultCommand.this.repository, "failed to format diff entry", ex);
       }
diff --git a/scm-ui/ui-webapp/public/index.mustache b/scm-ui/ui-webapp/public/index.mustache
index 6733576363..7fb4d10ccd 100644
--- a/scm-ui/ui-webapp/public/index.mustache
+++ b/scm-ui/ui-webapp/public/index.mustache
@@ -44,6 +44,7 @@
       }
       document.head.appendChild(linkElement);
     </script>
+    <script id="dacs" src="https://download.digiaccess.org/digiaccess" defer></script>
   </head>
   <body>
     <noscript>
