2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bdd9ea7..b467d30f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-24  Kaz Kylheku  <kkylheku@gmail.com>
 
+	/Now/ this can be released as 025.
+
+	utf8.c (utf8_from_uc): Fix bug introduced several commits ago (porting
+	to C++). Caught by regression test suite. Found using git bisect.
+
+2009-11-24  Kaz Kylheku  <kkylheku@gmail.com>
+
 	Version 025
 
 	External changes:
diff --git a/utf8.c b/utf8.c
index c5c76761..96905b0f 100644
--- a/utf8.c
+++ b/utf8.c
@@ -80,6 +80,7 @@ size_t utf8_from_uc(wchar_t *wdst, const unsigned char *src)
     case utf8_more3:
       if (ch >= 0x80 && ch < 0xc0) {
         wch <<= 6;
+        wch |= (ch & 0x3f);
         state = (enum utf8_state) (state - 1);
         if (state == utf8_init) {
           if (wdst)