diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index 5cbd452..ecb9718 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -34,6 +34,20 @@
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
   
+  get("/:owner/:repository/wiki/:page/_history"){
+    val owner      = params("owner")
+    val repository = params("repository")
+    val page       = params("page")
+    val git        = Git.open(WikiUtil.getWikiRepositoryDir(owner, repository))
+    
+    html.wikihistory(Some(page),
+      JGitUtil.getCommitLog(git, "master")._1.filter { commit =>
+        JGitUtil.getDiffs(git, commit.id).find(_.newPath == page + ".md").isDefined
+      },
+      JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+  }
+  
+  
   get("/:owner/:repository/wiki/:page/_edit"){
     val owner      = params("owner")
     val repository = params("repository")
@@ -74,8 +88,8 @@
     val owner      = params("owner")
     val repository = params("repository")
     
-    // TODO retrieve all commit logs.
-    html.wikihistory(JGitUtil.getCommitLog(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), "master")._1, 
+    html.wikihistory(None,
+        JGitUtil.getCommitLog(Git.open(WikiUtil.getWikiRepositoryDir(owner, repository)), "master")._1, 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
 }
\ No newline at end of file
diff --git a/src/main/twirl/wiki.scala.html b/src/main/twirl/wiki.scala.html
index ccae4a5..6f0583e 100644
--- a/src/main/twirl/wiki.scala.html
+++ b/src/main/twirl/wiki.scala.html
@@ -13,7 +13,7 @@
         <div class="btn-group">
         <a class="btn" href="@path/@repository.owner/@repository.name/wiki/_new">New Page</a>
         <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_edit">Edit Page</a>
-        <a class="btn" href="#">Page History</a>
+        <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_history">Page History</a>
         </div>
       </li>
     </ul>
diff --git a/src/main/twirl/wikihistory.scala.html b/src/main/twirl/wikihistory.scala.html
index b9aa52b..cb99b58 100644
--- a/src/main/twirl/wikihistory.scala.html
+++ b/src/main/twirl/wikihistory.scala.html
@@ -1,12 +1,19 @@
-@(commits: List[app.CommitInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
+@(pageName: Option[String], commits: List[app.CommitInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
 @main("History - " + repository.owner + "/" + repository.name){
   @header("wiki", repository)
-  @wikitab("history", repository)
+  @wikitab(if(pageName.isEmpty) "history" else "", repository)
   <ul class="nav nav-tabs">
     <li>
-      <h1 class="wiki-title"><span class="description">Pages</span></h1>
+      <h1 class="wiki-title">
+        @if(pageName.nonEmpty){
+          <span class="description">History for</span> @pageName.get
+        }
+        @if(pageName.isEmpty){
+          <span class="description">History</span>
+        }
+      </h1>
     </li>
     <li class="pull-right">
       <div class="btn-group">