diff --git a/wiki.pl b/wiki.pl
index f8ca89eb..64076635 100755
--- a/wiki.pl
+++ b/wiki.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/perl
-# Version       $Id: wiki.pl,v 1.955 2011/11/19 15:28:26 as Exp $
+# Version       $Id: wiki.pl,v 1.956 2011/11/21 00:32:05 as Exp $
 # Copyleft      2008 Brian Curry <http://www.raiazome.com>
 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #     Alex Schroeder <alex@gnu.org>
@@ -36,7 +36,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use vars qw($VERSION);
 local $| = 1;  # Do not buffer output (localized for mod_perl)
 
-$VERSION=(split(/ +/, q{$Revision: 1.955 $}))[1]; # for MakeMaker
+$VERSION=(split(/ +/, q{$Revision: 1.956 $}))[1]; # for MakeMaker
 
 # Options:
 use vars qw($RssLicense $RssCacheHours @RcDays $TempDir $LockDir $DataDir
@@ -290,7 +290,7 @@ sub InitRequest {
 sub InitVariables {  # Init global session variables for mod_perl!
   $WikiDescription = $q->p($q->a({-href=>'http://www.oddmuse.org/'}, 'Oddmuse'),
          $Counter++ > 0 ? Ts('%s calls', $Counter) : '')
-    . $q->p(q{$Id: wiki.pl,v 1.955 2011/11/19 15:28:26 as Exp $});
+    . $q->p(q{$Id: wiki.pl,v 1.956 2011/11/21 00:32:05 as Exp $});
   $WikiDescription .= $ModulesDescription if $ModulesDescription;
   $PrintedHeader = 0; # Error messages don't print headers unless necessary
   $ReplaceForm = 0;   # Only admins may search and replace
@@ -891,9 +891,9 @@ sub PrintAllPages {
     my @languages = split(/,/, $Page{languages});
     next if $lang and @languages and not grep(/$lang/, @languages);
     next if PageMarkedForDeletion();
-    my $title = NormalToFree($id);
     print $q->start_div({-class=>'page'}),
-      $q->h1($links ? GetPageLink($id, $title) : $q->a({-name=>$id},$title));
+      $q->h1($links ? GetPageLink($id)
+	     : $q->a({-name=>$id}, UrlEncode(FreeToNormal($id))));
     PrintPageHtml();
     if ($comments and $id !~ /^$CommentsPrefix/o) {
       print $q->p({-class=>'comment'},