diff --git a/CPP/7zip/Archive/Zip/ZipHandler.cpp b/CPP/7zip/Archive/Zip/ZipHandler.cpp
index 6c029c05..6f9ccd63 100644
--- a/CPP/7zip/Archive/Zip/ZipHandler.cpp
+++ b/CPP/7zip/Archive/Zip/ZipHandler.cpp
@@ -87,7 +87,9 @@ const char * const kMethodNames1[kNumMethodNames1] =
 
 const char * const kMethodNames2[kNumMethodNames2] =
 {
-    "xz"
+    "zstd"
+  , NULL
+  , "xz"
   , "Jpeg"
   , "WavPack"
   , "PPMd"
diff --git a/CPP/7zip/Archive/Zip/ZipHandler.h b/CPP/7zip/Archive/Zip/ZipHandler.h
index bee57c00..88b3eb39 100644
--- a/CPP/7zip/Archive/Zip/ZipHandler.h
+++ b/CPP/7zip/Archive/Zip/ZipHandler.h
@@ -16,7 +16,7 @@ namespace NArchive {
 namespace NZip {
 
 const unsigned kNumMethodNames1 = NFileHeader::NCompressionMethod::kLZMA + 1;
-const unsigned kMethodNames2Start = NFileHeader::NCompressionMethod::kXz;
+const unsigned kMethodNames2Start = NFileHeader::NCompressionMethod::kZstd;
 const unsigned kNumMethodNames2 = NFileHeader::NCompressionMethod::kWzAES + 1 - kMethodNames2Start;
 
 extern const char * const kMethodNames1[kNumMethodNames1];
@@ -74,7 +74,7 @@ private:
     m_WriteNtfsTimeExtra = true;
     _removeSfxBlock = false;
     m_ForceLocal = false;
-    m_ForceUtf8 = false;
+    m_ForceUtf8 = true;
     _forceCodePage = false;
     _specifiedCodePage = CP_OEMCP;
   }
diff --git a/CPP/7zip/UI/GUI/CompressDialog.cpp b/CPP/7zip/UI/GUI/CompressDialog.cpp
index 3cce4638..9abd4d18 100644
--- a/CPP/7zip/UI/GUI/CompressDialog.cpp
+++ b/CPP/7zip/UI/GUI/CompressDialog.cpp
@@ -223,7 +223,8 @@ static const EMethodID g_ZipMethods[] =
   kDeflate64,
   kBZip2,
   kLZMA,
-  kPPMdZip
+  kPPMdZip,
+  kZSTD
 };
 
 static const EMethodID g_GZipMethods[] =