--- a/templates/fileannotate.tmpl
+++ b/templates/fileannotate.tmpl
@@ -1,5 +1,5 @@
#header#
-<title>#repo|escape#: #file# annotate</title>
+<title>#repo|escape#: #file|escape# annotate</title>
</head>
<body>
@@ -7,12 +7,12 @@
<a href="?cl=#rev#">changelog</a>
<a href="?tags=">tags</a>
<a href="?cs=#node|short#">changeset</a>
-<a href="?mf=#manifest|short#;path=#path#">manifest</a>
-<a href="?f=#filenode|short#;file=#file#">file</a>
-<a href="?fl=#filenode|short#;file=#file#">revisions</a>
+<a href="?mf=#manifest|short#;path=#path|urlescape#">manifest</a>
+<a href="?f=#filenode|short#;file=#file|urlescape#">file</a>
+<a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a>
</div>
-<h2>Annotate #file#</h2>
+<h2>Annotate #file|escape#</h2>
<table>
<tr>