diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala
index 0d37b09..5a1242d 100644
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -24,7 +24,7 @@
  * @param branchList the list of branch names
  * @param tags the list of tags
  */
-case class RepositoryInfo(owner: String, name: String, url: String, branchList: List[String], tags: List[String])
+case class RepositoryInfo(owner: String, name: String, url: String, branchList: List[String], tags: List[TagInfo])
 
 /**
  * The file data for the file list of the repository viewer.
@@ -62,6 +62,15 @@
 case class ContentInfo(viewType: String, content: Option[String])
 
 /**
+ * The tag data.
+ * 
+ * @param name the tag name
+ * @param time the tagged date
+ * @param id the commit id
+ */
+case class TagInfo(name: String, time: Date, id: String)
+
+/**
  * The repository viewer.
  */
 class RepositoryViewerController extends ControllerBase {
diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala
index 683f366..e703a3b 100644
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -1,7 +1,7 @@
 package util
 
 import org.eclipse.jgit.api.Git
-import app.{RepositoryInfo, FileInfo, CommitInfo, DiffInfo}
+import app.{RepositoryInfo, FileInfo, CommitInfo, DiffInfo, TagInfo}
 import util.Directory._
 import scala.collection.JavaConverters._
 import javax.servlet.ServletContext
@@ -28,6 +28,20 @@
 object JGitUtil {
   
   /**
+   * Returns RevCommit from the commit id.
+   * 
+   * @param git the Git object
+   * @param commitId the ObjectId of the commit
+   * @return the RevCommit for the specified commit
+   */
+  def getRevCommitFromId(git: Git, commmitId: ObjectId): RevCommit = {
+    val revWalk = new RevWalk(git.getRepository)
+    val revCommit = revWalk.parseCommit(commmitId)
+    revWalk.dispose
+    revCommit
+  }
+  
+  /**
    * Returns the repository information. It contains branch names and tag names.
    */
   def getRepositoryInfo(owner: String, repository: String, servletContext: ServletContext): RepositoryInfo = {
@@ -35,12 +49,13 @@
     RepositoryInfo(
       owner, repository, "http://localhost:8080%s/git/%s/%s.git".format(servletContext.getContextPath, owner, repository),
       // branches
-      git.branchList.call.toArray.map { ref =>
-        ref.asInstanceOf[Ref].getName.replaceFirst("^refs/heads/", "")
+      git.branchList.call.asScala.map { ref =>
+        ref.getName.replaceFirst("^refs/heads/", "")
       }.toList,
       // tags
-      git.tagList.call.toArray.map { ref =>
-        ref.asInstanceOf[Ref].getName
+      git.tagList.call.asScala.map { ref =>
+        val revCommit = getRevCommitFromId(git, ref.getObjectId)
+        TagInfo(ref.getName.replaceFirst("^refs/tags/", ""), revCommit.getCommitterIdent.getWhen, revCommit.getName)
       }.toList
     )   
   }
diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html
index 3536f5e..a6b4ea3 100644
--- a/src/main/twirl/repo/tags.scala.html
+++ b/src/main/twirl/repo/tags.scala.html
@@ -6,11 +6,17 @@
   @navtab("master", repository, "tags") @* TODO DON'T display branch pulldown *@
   <h1>Tags</h1>
   <table class="table table-bordered">
+    <tr>
+      <th width="40%">Tag</th>
+      <th width="20%">Commit</th>
+      <th width="20%">Date</th>
+      <th width="20%">Download</th>
+    </tr>
     @repository.tags.map { tag =>
       <tr>
-        <td>@tag</td>
-        <td>yyyy/MM/dd HH:mm:SS</td>
-        <td><a href="">xxxxxxxxxx</a></td>
+        <td>@tag.name</td>
+        <td>@helpers.datetime(tag.time)</td>
+        <td><a href="@path/@repository.owner/@repository.name/tree/@tag.id">@tag.id.substring(0, 10)</a></td>
         <td><a href="">ZIP</a></td>
       </tr>
     }