diff --git a/doc/style.css b/doc/style.css
index b7adfa10aad..6a99b810c92 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -7,6 +7,10 @@
 /* ------------------------------------------------------------------------- */
 /* Styles meant to help page authors achieve beauty. */
 
+a {
+  text-decoration: none;
+}
+
 code, .code {
   font-size: 100%;
   font-family: monospace;
@@ -179,14 +183,6 @@ div#linkList li.navhead {
 /* ------------------------------------------------------------------------- */
 /* Styles used by godoc */
 
-a.noline {
-  text-decoration: none;
-}
-
-a.info {
-  text-decoration: none;
-}
-
 table.layout {
   border-width: 0px;
   border-spacing: 0px;
diff --git a/lib/godoc/dirlist.html b/lib/godoc/dirlist.html
index 7962885625c..c1f24d758da 100644
--- a/lib/godoc/dirlist.html
+++ b/lib/godoc/dirlist.html
@@ -14,11 +14,11 @@
 	<th align="left">Modified</th>
 </tr>
 <tr>
-	<td><a href=".." class="noline">..</a></td>
+	<td><a href="..">..</a></td>
 </tr>
 {.repeated section @}
 <tr>
-	<td align="left"><a href="{Name|html}" class="noline">{Name|html}</a></td>
+	<td align="left"><a href="{Name|html}">{Name|html}</a></td>
 	<td></td>
 	<td align="right">{Size|html}</td>
 	<td></td>
diff --git a/lib/godoc/godoc.html b/lib/godoc/godoc.html
index 3b46e96dac5..cae2cdaea7c 100644
--- a/lib/godoc/godoc.html
+++ b/lib/godoc/godoc.html
@@ -75,34 +75,34 @@
 
 <div id="linkList">
   <ul>
-    <li class="navhead"><a href="/" class="noline">Home</a></li>
+    <li class="navhead"><a href="/">Home</a></li>
 
     <li class="blank">&nbsp;</li>
     <li class="navhead">Documents</li>
-    <li><a href="/doc/go_tutorial.html" class="noline">Tutorial</a></li>
-    <li><a href="/doc/effective_go.html" class="noline">Effective Go</a></li>
-    <li><a href="/doc/go_faq.html" class="noline">FAQ</a></li>
-    <li><a href="/doc/go_lang_faq.html" class="noline">Language Design FAQ</a></li>
-    <li><a href="/XXX" class="noline">Tech talk (1 hour)</a></li>
-    <li><a href="/doc/go_spec.html" class="noline">Language Specification</a></li>
-    <li><a href="/doc/go_mem.html" class="noline">Memory Model</a></li>
-    <li><a href="/doc/go_for_cpp_programmers.html" class="noline">Go for C++ Programmers</a></li>
+    <li><a href="/doc/go_tutorial.html">Tutorial</a></li>
+    <li><a href="/doc/effective_go.html">Effective Go</a></li>
+    <li><a href="/doc/go_faq.html">FAQ</a></li>
+    <li><a href="/doc/go_lang_faq.html">Language Design FAQ</a></li>
+    <li><a href="/XXX">Tech talk (1 hour)</a></li>
+    <li><a href="/doc/go_spec.html">Language Specification</a></li>
+    <li><a href="/doc/go_mem.html">Memory Model</a></li>
+    <li><a href="/doc/go_for_cpp_programmers.html">Go for C++ Programmers</a></li>
 
     <li class="blank">&nbsp;</li>
     <li class="navhead">How To</li>
-    <li><a href="/doc/install.html" class="noline">Install Go</a></li>
-    <li><a href="/doc/contribute.html" class="noline">Contribute code</a></li>
+    <li><a href="/doc/install.html">Install Go</a></li>
+    <li><a href="/doc/contribute.html">Contribute code</a></li>
 
     <li class="blank">&nbsp;</li>
     <li class="navhead">Programming</li>
-    <li><a href="/cmd" class="noline">Command documentation</a></li>
-    <li><a href="/pkg" class="noline">Package documentation</a></li>
-    <li><a href="/src" class="noline">Source files</a></li>
+    <li><a href="/cmd">Command documentation</a></li>
+    <li><a href="/pkg">Package documentation</a></li>
+    <li><a href="/src">Source files</a></li>
 
     <li class="blank">&nbsp;</li>
     <li class="navhead">Help</li>
-    <li><a href="http://code.google.com/p/go/issues/list" class="noline">Issue tracker</a></li>
-    <li><a href="http://groups.google.com/group/golang-nuts" class="noline">Go Nuts mailing list</a></li>
+    <li><a href="http://code.google.com/p/go/issues/list">Issue tracker</a></li>
+    <li><a href="http://groups.google.com/group/golang-nuts">Go Nuts mailing list</a></li>
 
     <li class="blank">&nbsp;</li>
     <li class="navhead">Go code search</li>
diff --git a/lib/godoc/package.html b/lib/godoc/package.html
index e39899008c9..4bb00525783 100644
--- a/lib/godoc/package.html
+++ b/lib/godoc/package.html
@@ -38,14 +38,14 @@
 	{.end}
 	{.section Funcs}
 		{.repeated section @}
-			<h2>func <a href="{Decl|link}" class="noline">{Name|html}</a></h2>
+			<h2>func <a href="{Decl|link}">{Name|html}</a></h2>
 			<p><code>{Decl|html}</code></p>
 			{Doc|html-comment}
 		{.end}
 	{.end}
 	{.section Types}
 		{.repeated section @}
-			<h2>type <a href="{Decl|link}" class="noline">{Type.Name|html}</a></h2>
+			<h2>type <a href="{Decl|link}">{Type.Name|html}</a></h2>
 			{Doc|html-comment}
 			<p><pre>{Decl|html}</pre></p>
 			{.repeated section Consts}
@@ -57,12 +57,12 @@
 				<pre>{Decl|html}</pre>
 			{.end}
 			{.repeated section Factories}
-				<h3>func <a href="{Decl|link}" class="noline">{Name|html}</a></h3>
+				<h3>func <a href="{Decl|link}">{Name|html}</a></h3>
 				<p><code>{Decl|html}</code></p>
 				{Doc|html-comment}
 			{.end}
 			{.repeated section Methods}
-				<h3>func ({Recv|html}) <a href="{Decl|link}" class="noline">{Name|html}</a></h3>
+				<h3>func ({Recv|html}) <a href="{Decl|link}">{Name|html}</a></h3>
 				<p><code>{Decl|html}</code></p>
 				{Doc|html-comment}
 			{.end}
@@ -87,7 +87,7 @@
 	{.repeated section List}
 		<tr>
 		{Depth|padding}
-		<td align="left" colspan="{Height|html}"><a href="{Path|html}" class="noline">{Name|html}<a></td>
+		<td align="left" colspan="{Height|html}"><a href="{Path|html}">{Name|html}<a></td>
 		<td></td>
 		<td align="left">{Synopsis|html}</td>
 		</tr>
diff --git a/lib/godoc/search.html b/lib/godoc/search.html
index e715df3439c..43904213e64 100644
--- a/lib/godoc/search.html
+++ b/lib/godoc/search.html
@@ -22,11 +22,11 @@
 	{.section Decls}
 		<h2>Package-level declarations</h2>
 		{.repeated section @}
-			<h3>package <a href="{Pak.Path|path}" class="noline">{Pak.Name|html}</a></h3>
+			<h3>package <a href="{Pak.Path|path}">{Pak.Name|html}</a></h3>
 			{.repeated section Files}
 				{.repeated section Groups}
 					{.repeated section Infos}
-						<a href="{File.Path|html}?h={Query|html}#L{@|infoLine}" class="noline">{File.Path|html}:{@|infoLine}</a>
+						<a href="{File.Path|html}?h={Query|html}#L{@|infoLine}">{File.Path|html}:{@|infoLine}</a>
 						<pre>{@|infoSnippet}</pre>
 					{.end}
 				{.end}
@@ -36,9 +36,9 @@
 	{.section Others}
 		<h2>Local declarations and uses</h2>
 		{.repeated section @}
-			<h3>package <a href="{Pak.Path|path}" class="noline">{Pak.Name|html}</a></h3>
+			<h3>package <a href="{Pak.Path|path}">{Pak.Name|html}</a></h3>
 			{.repeated section Files}
-				<a href="{File.Path|html}?h={Query|html}" class="noline">{File.Path|html}</a>
+				<a href="{File.Path|html}?h={Query|html}">{File.Path|html}</a>
 				<table class="layout">
 				{.repeated section Groups}
 					<tr>
@@ -47,7 +47,7 @@
 					<td align="left" width="4"></td>
 					<td>
 					{.repeated section Infos}
-						<a href="{File.Path|html}?h={Query|html}#L{@|infoLine}" class="info">{@|infoLine}</a>
+						<a href="{File.Path|html}?h={Query|html}#L{@|infoLine}">{@|infoLine}</a>
 					{.end}
 					</td>
 					</tr>