diff --git a/share/sgml/header.ent b/share/sgml/header.ent
index 1bf5a0c78b..fd57fb84f0 100644
--- a/share/sgml/header.ent
+++ b/share/sgml/header.ent
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/header.ent,v 1.5 2007/02/15 21:37:29 gabor Exp $ -->
+<!-- $FreeBSD: www/share/sgml/header.ent,v 1.6 2007/02/15 21:49:46 gabor Exp $ -->
 
 <!-- FreeBSD HTML Header Entities -->
 <!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN" -->
@@ -86,16 +86,19 @@
 
 <![ %xml.features; [
 <!ENTITY header2.searchinputs '
+	<div xml:space="preserve">
             <input type="hidden" name="max" value="25" />
             <input type="hidden" name="source" value="www" />
             <input id="WORDS" name="words" type="text" size="20"
                    maxlength="255"
                    onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;"
-                   value="&header2.word.search;" />
+                   value="&header2.word.search;" /><![CDATA[ ]]>
             <input id="SUBMIT" name="submit" type="submit" value="&header2.word.search;" />
+	</div>
 '>
 ]]>
 <!ENTITY header2.searchinputs '
+	<div>
             <input type="hidden" name="max" value="25">
             <input type="hidden" name="source" value="www">
             <input id="WORDS" name="words" type="text" size="20"
@@ -103,6 +106,7 @@
                    onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;"
                    value="&header2.word.search;">
             <input id="SUBMIT" name="submit" type="submit" value="&header2.word.search;">
+	</div>
 '>
 
 <!ENTITY header2.topnav '