diff --git a/IkiWiki.pm b/IkiWiki.pm
index 85710c5ff..29add5c34 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -5,7 +5,7 @@ use warnings;
 use strict;
 use Encode;
 use HTML::Entities;
-use URI::Escape;
+use URI::Escape q{uri_escape_utf8};
 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
@@ -387,7 +387,7 @@ sub cgiurl (@) { #{{{
 	my %params=@_;
 
 	return $config{cgiurl}."?".
-		join("&", map $_."=".uri_escape($params{$_}), keys %params);
+		join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 } #}}}
 
 sub baseurl (;$) { #{{{
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index d6069cb6e..7d5af02ed 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-08 00:56-0500\n"
+"POT-Creation-Date: 2007-03-08 01:08-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"