diff --git a/res/assets/templates/macros.cs b/res/assets/templates/macros.cs
index ee0aa7f..a09b346 100644
--- a/res/assets/templates/macros.cs
+++ b/res/assets/templates/macros.cs
@@ -73,7 +73,7 @@
       elif:tag.kind == "@see" ?><code><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs var:tag.label ?></a></code><?cs
       elif:tag.kind == "@seeHref" ?><a href="<?cs var:tag.href ?>"><?cs var:tag.label ?></a><?cs
       elif:tag.kind == "@seeJustLabel" ?><?cs var:tag.label ?><?cs
-      elif:tag.kind == "@value" ?><code class='value'><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs var:tag.label ?></a></code><?cs
+      elif:tag.kind == "@value" ?><code><a href="<?cs var:toroot ?><?cs var:tag.href ?>"><?cs var:tag.text ?></a></code><?cs
       elif:tag.kind == "@code" ?><code><?cs var:tag.text ?></code><?cs
       elif:tag.kind == "@samplecode" ?><pre><?cs var:tag.text ?></pre><?cs
       elif:tag.name == "@sample" ?><pre><?cs var:tag.text ?></pre><?cs
diff --git a/src/com/google/doclava/Comment.java b/src/com/google/doclava/Comment.java
index e50ff0a..70f4f30 100644
--- a/src/com/google/doclava/Comment.java
+++ b/src/com/google/doclava/Comment.java
@@ -204,9 +204,6 @@
       // maybe i wanna make this more elegant
       String tagName = text.substring(start+1, endOfFirstPart);
       String tagText = text.substring(startOfSecondPart, end-1);
-      if (tagName.equals("@value")) {
-        tagText = tagText.replace('#', '.');
-      }
       tag(tagName, tagText, true, pos);
   }
 
diff --git a/src/com/google/doclava/TagInfo.java b/src/com/google/doclava/TagInfo.java
index 09d4e35..ec1f811 100644
--- a/src/com/google/doclava/TagInfo.java
+++ b/src/com/google/doclava/TagInfo.java
@@ -53,6 +53,10 @@
 
   public void makeHDF(Data data, String base) {
     data.setValue(base + ".name", name());
+
+    if (name().equals("@value")) {
+      mText = mText.replace('#', '.');
+    }
     data.setValue(base + ".text", text());
     data.setValue(base + ".kind", kind());
   }