diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index ee91816b74a..9020f6b8d66 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8893
\ No newline at end of file
+8894
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Token.pm b/mozilla/webtools/bugzilla/Bugzilla/Token.pm
index 9ebf9c65221..74f7805426e 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Token.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Token.pm
@@ -168,6 +168,10 @@ sub issue_hash_token {
     my @args = ($time, $user_id, @$data);
 
     my $token = join('*', @args);
+    # Wide characters cause Digest::SHA to die.
+    if (Bugzilla->params->{'utf8'}) {
+        utf8::encode($token) if utf8::is_utf8($token);
+    }
     $token = hmac_sha256_base64($token, Bugzilla->localconfig->{'site_wide_secret'});
     $token =~ s/\+/-/g;
     $token =~ s/\//_/g;
diff --git a/mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl
index ef6090c415d..f214bda0a51 100644
--- a/mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl
@@ -61,6 +61,9 @@
   <li>An error about <kbd>longdescs.comment_id</kbd> was thrown by MySQL 5.0
     and 5.1 when upgrading to Bugzilla 4.4 or 4.4.1.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=870369">[% terms.Bug %] 870369</a>)</li>
+  <li>Saved searches containing Unicode characters in their name could not
+    be run if Digest::SHA 5.82 or newer is installed.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=964113">[% terms.Bug %] 964113</a>)</li>
   <li>A regression in Bugzilla 4.4.1 caused <kbd>email_in.pl</kbd> to fail
     with an "invalid token" error message.
     (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=928331">[% terms.Bug %] 928331</a> and