diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala
index 3addf6282..0d37b0954 100644
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -205,6 +205,16 @@ class RepositoryViewerController extends ControllerBase {
     repo.html.commit(id, new CommitInfo(revCommit), JGitUtil.getRepositoryInfo(owner, repository, servletContext), JGitUtil.getDiffs(git, id))
   }
   
+  /**
+   * Displays tags.
+   */
+  get("/:owner/:repository/tags"){
+    val owner      = params("owner")
+    val repository = params("repository")
+    
+    repo.html.tags(JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+  }
+  
   /**
    * Provides HTML of the file list.
    * 
diff --git a/src/main/twirl/repo/navtab.scala.html b/src/main/twirl/repo/navtab.scala.html
index 4c4689cfd..4bae16551 100644
--- a/src/main/twirl/repo/navtab.scala.html
+++ b/src/main/twirl/repo/navtab.scala.html
@@ -20,7 +20,7 @@
   </li>
   <li@if(active=="files"){ class="active"}><a href="@path/@repository.owner/@repository.name/tree/@id">Files</a></li>
   <li@if(active=="commits"){ class="active"}><a href="@path/@repository.owner/@repository.name/commits/@id">Commits</a></li>
-  <li@if(active=="tags"){ class="active"}><a href="#">Tags</a></li>
+  <li@if(active=="tags"){ class="active"}><a href="@path/@repository.owner/@repository.name/tags">Tags</a></li>
   <li class="pull-right">
     <div class="input-prepend">
       <span class="add-on">HTTP</span>
diff --git a/src/main/twirl/repo/tags.scala.html b/src/main/twirl/repo/tags.scala.html
new file mode 100644
index 000000000..3536f5ea4
--- /dev/null
+++ b/src/main/twirl/repo/tags.scala.html
@@ -0,0 +1,18 @@
+@(repository: app.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers
+@html.main(repository.owner + "/" + repository.name) {
+  @html.header("code", repository)
+  @navtab("master", repository, "tags") @* TODO DON'T display branch pulldown *@
+  <h1>Tags</h1>
+  <table class="table table-bordered">
+    @repository.tags.map { tag =>
+      <tr>
+        <td>@tag</td>
+        <td>yyyy/MM/dd HH:mm:SS</td>
+        <td><a href="">xxxxxxxxxx</a></td>
+        <td><a href="">ZIP</a></td>
+      </tr>
+    }
+  </table>
+}
\ No newline at end of file