diff --git a/i18n-tools/scripts/create_translations.sh b/i18n-tools/scripts/create_translations.sh
index 823d54fc..464debd5 100755
--- a/i18n-tools/scripts/create_translations.sh
+++ b/i18n-tools/scripts/create_translations.sh
@@ -23,7 +23,7 @@ if [ -n "$VERBOSE" ]; then
 else
     verbosity="-q"
 fi
-PERL5LIB="${SCRIPT_DIR}/perllib${PERL5LIB+:}$PERL5LIB" po4a -k0 $verbosity -f "$PO4A_FILE" --msgmerge-opt -F
+PERL5LIB="${SCRIPT_DIR}/perllib${PERL5LIB+:}$PERL5LIB" po4a -k0 $verbosity -f "$PO4A_FILE"
 
 IFS=':' read -a source_files_array <<< "$SOURCE_FILES"
 IFS=':' read -a output_files_array <<< "$OUTPUT_FILES"
diff --git a/levels/CMakeLists.txt b/levels/CMakeLists.txt
index fee7979d..8dbd665d 100644
--- a/levels/CMakeLists.txt
+++ b/levels/CMakeLists.txt
@@ -7,6 +7,7 @@ include(../i18n-tools/LevelsI18N.cmake)
 ##
 function(add_level_category level_category_dir)
     file(GLOB chaptertitle_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${level_category_dir}/chapter*/chaptertitle.txt)
+    list(SORT chaptertitle_files)
     if(PO4A AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${level_category_dir}/po/)
         generate_chaptertitles_i18n(translated_chaptertitle_files "${chaptertitle_files}" ${level_category_dir}/po)
     else()
@@ -14,6 +15,7 @@ function(add_level_category level_category_dir)
     endif()
 
     file(GLOB chapter_dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${level_category_dir}/chapter*)
+    list(SORT chapter_dirs)
     list(LENGTH chapter_dirs chapter_dirs_count)
     math(EXPR iterate_range "${chapter_dirs_count} - 1")
     foreach(index RANGE ${iterate_range})