diff --git a/Misc/ACKS b/Misc/ACKS
index f349b1e..b5dccde 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -131,6 +131,7 @@
 Brad Chapman
 David Chaum
 Nicolas Chauvat
+Jerry Chen
 Michael Chermside
 Albert Chin-A-Young
 Adal Chiriliuc
diff --git a/Misc/NEWS b/Misc/NEWS
index 124ea0f..9d2b7cf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -242,6 +242,10 @@
 Library
 -------
 
+- Issue #6233: ElementTree failed converting unicode characters to XML
+  entities when they could't be represented in the requested output
+  encoding.  Patch by Jerry Chen.
+
 - Issue #6003: add an argument to ``zipfile.Zipfile.writestr`` to
   specify the compression type.