diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index 797bfc6bd..bc62f71d6 100644
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -47,7 +47,7 @@ sub format (@) { #{{{
 		if ($tagname =~ /^h(\d+)$/i) {
 			my $level=$1;
 			my $anchor="index".++$anchors{$level}."h$level";
-			$page.="$text<a name=\"$anchor\" />";
+			$page.="$text<a name=\"$anchor\"></a>";
 	
 			# Take the first header level seen as the topmost level,
 			# even if there are higher levels seen later on.
diff --git a/debian/changelog b/debian/changelog
index d946f12e1..f8b04172a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (2.4) UNRELEASED; urgency=low
+
+  * Make the toc plugin use html-compatible anchors. This is necessary since
+    most web sites serve ikiwiki xhtml files as text/html and mozilla browsers
+    get confused. So it's best for ikiwiki to follow the compatability 
+    recommendations in appendix C of the XHTML spec. Closes: #432045
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 08 Jul 2007 12:54:55 -0400
+
 ikiwiki (2.3) unstable; urgency=low
 
   * Corrected a typo in an error handler in the image plugin.