diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 02dbd34bd..caec7f1f0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -58,7 +58,7 @@ sub backlinks ($) { #{{{
 			        $p_trimmed=~s/^\Q$dir\E// &&
 			        $page_trimmed=~s/^\Q$dir\E//;
 				       
-			push @links, { url => $href, page => $p_trimmed };
+			push @links, { url => $href, page => pagetitle($p_trimmed) };
 		}
 	}
 
@@ -76,7 +76,7 @@ sub parentlinks ($) { #{{{
 	foreach my $dir (reverse split("/", $page)) {
 		if (! $skip) {
 			$path.="../";
-			unshift @ret, { url => "$path$dir.html", page => $dir };
+			unshift @ret, { url => "$path$dir.html", page => pagetitle($dir) };
 		}
 		else {
 			$skip=0;
diff --git a/debian/changelog b/debian/changelog
index c50f52eae..84b806b3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,14 @@ ikiwiki (1.13) UNRELEASED; urgency=low
 
   * New pagestats plugin from Enrico, which can generate a table counting
     the backlinks for each page, or a del.icio.us style cloud.
+  * Build-depend on libtext-wikiformat-perl, so that the syntax check of
+    the wikiformat plugin works. Thanks, Emanuele Aina.
+  * Patch from Alessandro Dotti Contra to clean up backlinks and navbar
+    display, running them through pagetitle. This removes ugly underscores and
+    other gunk from the display, much nicer. You may want to rebuild your wiki
+    when upgrading to get the cleanup globally.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 29 Jul 2006 13:30:16 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 29 Jul 2006 14:22:18 -0400
 
 ikiwiki (1.12) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6880a8384..19cdddf8e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ikiwiki
 Section: web
 Priority: optional
 Build-Depends: perl, debhelper (>= 5)
-Build-Depends-Indep: dpkg-dev (>= 1.9.0), markdown, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator
+Build-Depends-Indep: dpkg-dev (>= 1.9.0), markdown, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libtext-wikiformat-perl
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.2