diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c79d40469..751c75ab5 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -56,7 +56,7 @@ sub change (@) { #{{{
 	IkiWiki::debug("updating hyperestraier search index");
 	IkiWiki::estcmd("gather -cm -bc -cl -sd",
 		map {
-			$IkiWiki::config{destdir}."/".$IkiWiki::renderedfiles{IkiWiki::pagename($_)}
+			Encode::encode_utf8($IkiWiki::config{destdir}."/".$IkiWiki::renderedfiles{IkiWiki::pagename($_)})
 		} @_
 	);
 	IkiWiki::estcfg();
diff --git a/debian/changelog b/debian/changelog
index b42371969..2a3418fb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,10 @@ ikiwiki (1.13) UNRELEASED; urgency=low
   * Include title metadata on aggregated posts for capitalised and un-munged
     titles.
   * Title metadata of inlined pages now shows up in blogs and rss feeds.
+  * Fix issue with unicode filenames and updating the hyper estradier search
+    index. (Aka Please Please Please, let that be the last one.)
 
- -- Joey Hess <joeyh@debian.org>  Sun, 30 Jul 2006 19:22:11 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 30 Jul 2006 21:18:16 -0400
 
 ikiwiki (1.12) unstable; urgency=low
 
diff --git a/doc/todo/aggregation.mdwn b/doc/todo/aggregation.mdwn
index d56e41e04..5abb6a53e 100644
--- a/doc/todo/aggregation.mdwn
+++ b/doc/todo/aggregation.mdwn
@@ -1,5 +1,7 @@
 * Still need to support feed expiry.
 * Need to store page author metadata and include it in the rss feed.
+  Permalink to? Also, that stuff could be presented better in the html blog
+  view, also using the metadata.
 * Some rss feeds contain relative links or relative urls to inline images,
   which break when aggregated. Do I need to parse the html and make them
   all absolute?