diff --git a/oniguruma/README.md b/oniguruma/README.md
index 873f86d43..b1bdbc52d 100644
--- a/oniguruma/README.md
+++ b/oniguruma/README.md
@@ -27,11 +27,12 @@ Supported character encodings:
 * doc/SYNTAX.md: contributed by seanofw
 
 
-New feature of version 6.9.2
+New feature of version 6.9.2 (Reiwa)
 -----------------------------------
 
+* add doc/SYNTAX.md
 * Update Unicode version 12.1.0
-* NEW: Unicode Text Segment mode option (?y{g}) (?y{w})
+* NEW: Unicode Text Segment mode option (?y{g}) (?y{w})  (*original)
 
   g: Extended Grapheme Cluster mode / w: Word mode
 
diff --git a/oniguruma/doc/UNICODE_PROPERTIES b/oniguruma/doc/UNICODE_PROPERTIES
index 1148b4d01..ff2a6cec0 100644
--- a/oniguruma/doc/UNICODE_PROPERTIES
+++ b/oniguruma/doc/UNICODE_PROPERTIES
@@ -1,4 +1,4 @@
-Unicode Properties (from Unicode Version: 12.0.0)
+Unicode Properties (from Unicode Version: 12.1.0)
 
  15: ASCII_Hex_Digit
  16: Adlam
diff --git a/scioniguruma/OnigurumaRegExEngine.cxx b/scioniguruma/OnigurumaRegExEngine.cxx
index 8cc911129..194bfab23 100644
--- a/scioniguruma/OnigurumaRegExEngine.cxx
+++ b/scioniguruma/OnigurumaRegExEngine.cxx
@@ -316,12 +316,12 @@ Sci::Position OnigurumaRegExEngine::FindText(Document* doc, Sci::Position minPos
     //~m_MatchPos = SciPos(result); //
     m_MatchPos = SciPos(m_Region.beg[0]);
     //~m_MatchLen = SciPos(m_Region.end[0] - result);
-    m_MatchLen = SciPos(m_Region.end[0] - m_Region.beg[0]);
+    m_MatchLen = SciPos(m_Region.end[0]) - SciPos(m_Region.beg[0]);
   }
 
   //NOTE: potential 64-bit-size issue at interface here:
   *length = m_MatchLen;
-  return SciPos(m_MatchPos);
+  return m_MatchPos;
 }
 // ============================================================================