diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8f8472f07..bbf850a17 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -839,7 +839,7 @@ sub unique_comment_location ($$$) {
 
 	eval q{use Digest::MD5 'md5_hex'};
 	error($@) if $@;
-	my $content_md5=md5_hex(shift);
+	my $content_md5=md5_hex(Encode::encode_utf8(shift));
 
 	my $dir=shift;
 
@@ -862,7 +862,7 @@ sub page_to_id ($) {
 	eval q{use Digest::MD5 'md5_hex'};
 	error($@) if $@;
 
-	return "comment-".md5_hex($page);
+	return "comment-".md5_hex(Encode::encode_utf8(($page));
 }
 	
 package IkiWiki::PageSpec;
diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index 0aaa79698..521af499f 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -8,6 +8,7 @@ use strict;
 use Digest::MD5 qw(md5_hex);
 use File::Temp qw(tempdir);
 use HTML::Entities;
+use Encode;
 use IkiWiki 3.00;
 
 my $default_prefix = <<EOPREFIX;
@@ -103,7 +104,7 @@ sub create ($$$) {
 		$height = 12;
 	}
 
-	my $digest = md5_hex($code, $height);
+	my $digest = md5_hex(Encode::encode_utf8($code), $height);
 
 	my $imglink= $params->{page} . "/$digest.png";
 	my $imglog =  $params->{page} .  "/$digest.log";
diff --git a/debian/changelog b/debian/changelog
index c0f99291f..d1253c079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100303) UNRELEASED; urgency=low
+
+  * Fix utf8 issues in calls to md5_hex.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
+
 ikiwiki (3.20100302) unstable; urgency=low
 
   * comments: Display number of comments in comment action link.