diff --git a/ChangeLog b/ChangeLog
index 256758b2..6bc44766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-12-03  Alex Schroeder  <alex@gnu.org>
+
+	* modules/namespaces.pl (NewNamespaceScriptUrl): Try and handle
+	the case of namespaces containing non-ASCII characters. This
+	should be legal, but lead to problems when generating links to
+	pages in such namespaces. The URL encoding of the non-ASCII
+	characters prevented the $InterSitePattern from matching. Instead
+	of using this regular expression, we now try and guess at the
+	string using URL constraints ([^/?&;=]+), URL decoding it, and
+	then checking the $InterSitePattern.
+
 2008-12-03  Brian Curry  <http://www.raiazome.com/Brian_Curry>
 
 	* wiki.pl (PrintWikiToHTML): Moved "@MyBeforeApplyRules"-specific
@@ -42,6 +53,8 @@
 
 2008-11-24  Alex Schroeder  <alex@gnu.org>
 
+	* wiki.pl (DoShowVersion): Print grep --version.
+
 	* modules/google-custom-search.pl ($GoogleCustomSearchEngine): New
 	option.
 	(GetSearchLink): Instead of overwriting it, use
diff --git a/t/google-custom-search.t b/t/google-custom-search.t
index e7449270..33f03402 100644
--- a/t/google-custom-search.t
+++ b/t/google-custom-search.t
@@ -18,7 +18,6 @@ package OddMuse;
 use Test::More tests => 2;
 clear_pages();
 
-# 
 add_module('google-custom-search.pl');
 
 xpath_test(update_page('the page'),