diff --git a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
index 45a6ef6..970469e 100644
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -250,7 +250,8 @@
             "author"   -> view.helpers.user(blame.authorName, blame.authorEmailAddress).toString,
             "avatar"   -> view.helpers.avatarLink(blame.authorName, 32, blame.authorEmailAddress).toString,
             "authed"   -> helper.html.datetimeago(blame.authorTime).toString,
-            "parent"   -> blame.parent,
+            "prev"     -> blame.prev,
+            "prevPath" -> blame.prevPath,
             "commited" -> blame.commitTime.getTime,
             "message"  -> blame.message,
             "lines"    -> blame.lines)
diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala
index 2e9d615..3042a41 100644
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -139,7 +139,7 @@
   case class BranchInfo(name: String, committerName: String, commitTime: Date, committerEmailAddress:String, mergeInfo: Option[BranchMergeInfo], commitId: String)
 
   case class BlameInfo(id: String, authorName: String, authorEmailAddress: String, authorTime:java.util.Date,
-    parent: Option[String], commitTime:java.util.Date, message:String, lines:Set[Int])
+    prev: Option[String], prevPath: Option[String], commitTime:java.util.Date, message:String, lines:Set[Int])
 
   /**
    * Returns RevCommit from the commit or tag id.
@@ -768,8 +768,9 @@
             c.getAuthorIdent.getName,
             c.getAuthorIdent.getEmailAddress,
             c.getAuthorIdent.getWhen,
-            Option(git.log.add(c).addPath(path).setSkip(1).setMaxCount(2).call.iterator.next)
+            Option(git.log.add(c).addPath(blame.getSourcePath(i)).setSkip(1).setMaxCount(2).call.iterator.next)
               .map(_.name),
+            if(blame.getSourcePath(i)==path){ None }else{ Some(blame.getSourcePath(i)) },
             c.getCommitterIdent.getWhen,
             c.getShortMessage,
             Set.empty)
diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html
index 60ce699..ffe865f 100644
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -186,9 +186,9 @@
           blame = index[i];
           var sha = $('<div class="blame-sha">')
              .append($('<a>').attr("href",data.root+'/commit/'+blame.id).text(blame.id.substr(0,7)));
-          if(blame.parent){
+          if(blame.prev){
              sha.append($('<br />'))
-             .append($('<a class="muted-link">').text('prev').attr("href",data.root+'/blame/'+blame.parent+'/'+data.path));
+             .append($('<a class="muted-link">').text('prev').attr("href",data.root+'/blame/'+blame.prev+'/'+(blame.prevPath||data.path)));
           }
           lastDiv = $('<div class="blame-info">')
            .addClass('heat'+Math.min(10,Math.max(1,Math.ceil((now-blame.commited)/(24*3600*1000*70)))))