diff --git a/CMakeLists.txt b/CMakeLists.txt
index a82d822..146897c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -509,19 +509,26 @@ install(FILES ${scripts}
   )
 
 foreach(in ${gde_routines})
-  string(REPLACE ".m" ".o" out "${in}")
-  add_custom_command(
-    OUTPUT ${out}
-    DEPENDS ${in} ${GTM_SOURCE_DIR}/sr_port/mumps.cmake
-    COMMAND ${CMAKE_COMMAND}
-      -D gtm_dist=${GTM_BINARY_DIR}
-      -D mumps=$<TARGET_FILE:mumps>
-      -D "args=${in}"
-      -P ${GTM_SOURCE_DIR}/sr_port/mumps.cmake
-    VERBATIM
-    )
-  list(APPEND files_to_place ${out})
-  install(FILES "${out}" DESTINATION ${GTM_INSTALL_DIR})
+  foreach(gtm_chset
+    ""
+    "UTF-8")
+    string(REPLACE "UTF-8" "/utf8" chset "${gtm_chset}")
+    string(REPLACE ".m" ".o" out "${in}")
+    add_custom_command(
+      OUTPUT ${chset}${out}
+      DEPENDS ${in} ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
+      COMMAND ${CMAKE_COMMAND}
+        -D gtm_dist=${GTM_BINARY_DIR}
+        -D gtm_chset=${gtm_chset}
+        -D gtm_icu_version="4.8"
+        -D mumps=$<TARGET_FILE:mumps>
+        -D "args=${in}"
+        -P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
+      VERBATIM
+      )
+    list(APPEND files_to_place ${out})
+    install(FILES "${out}" DESTINATION ${GTM_INSTALL_DIR}${chset})
+  endforeach()
 endforeach()
 
 set(GTM_TOP "${GTM_BINARY_DIR}")
@@ -571,14 +578,14 @@ add_custom_command(
   DEPENDS ${GTM_SOURCE_DIR}/sr_unix/ttt.txt
     gen/chk2lev.m gen/chkop.m gen/gendash.m gen/genout.m gen/loadop.m
     gen/loadvx.m gen/tttgen.m gen/tttscan.m
-    ${GTM_SOURCE_DIR}/sr_port/mumps.cmake
+    ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
   WORKING_DIRECTORY ${GTM_BINARY_DIR}/gen
   COMMAND ${CMAKE_COMMAND}
     -D gtm_dist=${GTM_BINARY_DIR}
     -D mumps=$<TARGET_FILE:mumps>
     -D "args=${mumps_ttt_args}"
     -D output_file=ttt.log
-    -P ${GTM_SOURCE_DIR}/sr_port/mumps.cmake
+    -P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
   VERBATIM
   )
 list(APPEND gen_bootstrap_files gen/ttt.c)
@@ -593,13 +600,13 @@ foreach(msg
   set(mumps_msg_args -run msg ${GTM_SOURCE_DIR}/${msg} unix)
   add_custom_command(
     OUTPUT gen/${name}_ctl.c
-    DEPENDS gen/msg.m ${GTM_SOURCE_DIR}/${msg} ${GTM_SOURCE_DIR}/sr_port/mumps.cmake
+    DEPENDS gen/msg.m ${GTM_SOURCE_DIR}/${msg} ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
     WORKING_DIRECTORY ${GTM_BINARY_DIR}/gen
     COMMAND ${CMAKE_COMMAND}
       -D gtm_dist=${GTM_BINARY_DIR}
       -D mumps=$<TARGET_FILE:mumps>
       -D "args=${mumps_msg_args}"
-      -P ${GTM_SOURCE_DIR}/sr_port/mumps.cmake
+      -P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
     VERBATIM
     )
   list(APPEND gen_bootstrap_files gen/${name}_ctl.c)
diff --git a/sr_port/mumps.cmake b/sr_unix/mumps.cmake
similarity index 88%
rename from sr_port/mumps.cmake
rename to sr_unix/mumps.cmake
index 7b16629..1f5221f 100644
--- a/sr_port/mumps.cmake
+++ b/sr_unix/mumps.cmake
@@ -10,6 +10,8 @@
 #################################################################
 set(ENV{gtm_dist} "${gtm_dist}")
 set(ENV{gtmroutines} ".")
+set(ENV{gtm_chset} "${gtm_chset}")
+set(ENV{gtm_icu_version} "${gtm_icu_version}")
 if(output_file)
   set(output_file OUTPUT_FILE ${output_file})
 endif()