diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index cc00fd5ff..b3f659f73 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -102,7 +102,7 @@ sub scrubber {
 				value vspace width
 
 				autoplay preload loopstart loopend end
-				playcount controls pubdate
+				playcount controls pubdate placeholder
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 9613d8b6d..951caab9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * htmlscrubber: Also allow html5 canvas tags.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
+  * htmlscrubber: Allow the placeholder attribute.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index c05208fbf..9c077a2d3 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -66,6 +66,8 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
 > * Use nav for the actionbar
+> * Use placeholder in the search box. Allows closing
+>   [[this_todo|Add_label_to_search_form_input_field]]
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements