diff --git a/i18n-tools/scripts/run_po4a.sh b/i18n-tools/scripts/run_po4a.sh
index 4d6e7c52..0e436600 100755
--- a/i18n-tools/scripts/run_po4a.sh
+++ b/i18n-tools/scripts/run_po4a.sh
@@ -28,7 +28,7 @@ if [ -n "$VERBOSE" ]; then
 else
     verbosity="-q"
 fi
-PERL5LIB="${SCRIPT_DIR}/perllib${PERL5LIB+:}$PERL5LIB" po4a -k0 $verbosity -f "$PO4A_CONFIG_FILE" --msgmerge-opt=--no-wrap
+PERL5LIB="${SCRIPT_DIR}/perllib${PERL5LIB+:}$PERL5LIB" po4a -k0 $verbosity -f "$PO4A_CONFIG_FILE" --msgmerge-opt=--no-wrap -M UTF-8 -L UTF-8
 
 # if applicable, touch dummy signal file to indicate success
 if [ -n "$PO4A_SIGNALFILE" ]; then
diff --git a/music b/music
index 4ed3af47..68744dcd 160000
--- a/music
+++ b/music
@@ -1 +1 @@
-Subproject commit 4ed3af47906fdeb6cf7e8ef5624f3ac701e91d90
+Subproject commit 68744dcdb7aa9e10f471fe1cca4910a4fd594a2f