diff --git a/pom.xml b/pom.xml
index b4947083cd..80888c93f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@ limitations under the License.
   </licenses>
 
   <properties>
-    <jgitVersion>0.4.0-388-gd3d9379</jgitVersion>
+    <jgitVersion>0.4.0-398-ge866578</jgitVersion>
     <gwtormVersion>1.1.1</gwtormVersion>
     <gwtjsonrpcVersion>1.1.0</gwtjsonrpcVersion>
     <gwtexpuiVersion>1.1.1</gwtexpuiVersion>
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchFile.java b/src/main/java/com/google/gerrit/server/patch/PatchFile.java
index 2023bace2a..32b734e670 100644
--- a/src/main/java/com/google/gerrit/server/patch/PatchFile.java
+++ b/src/main/java/com/google/gerrit/server/patch/PatchFile.java
@@ -51,7 +51,7 @@ public class PatchFile {
     final RevWalk rw = new RevWalk(repo);
     final RevCommit bCommit = rw.parseCommit(ObjectId.fromString(id.get()));
     if (bCommit.getParentCount() > 0) {
-      rw.parse(bCommit.getParent(0));
+      rw.parseHeaders(bCommit.getParent(0));
       aTree = bCommit.getParent(0).getTree();
     } else {
       aTree = emptyTree();
diff --git a/src/main/java/com/google/gerrit/server/ssh/AdminShowCaches.java b/src/main/java/com/google/gerrit/server/ssh/AdminShowCaches.java
index 5538024a0c..90cba333c5 100644
--- a/src/main/java/com/google/gerrit/server/ssh/AdminShowCaches.java
+++ b/src/main/java/com/google/gerrit/server/ssh/AdminShowCaches.java
@@ -67,7 +67,7 @@ class AdminShowCaches extends AbstractCommand {
     final long mFree = r.freeMemory();
     final long mTotal = r.totalMemory();
     final long mInuse = mTotal - mFree;
-    final int jgitBytes = WindowCacheStatAccessor.getOpenBytes();
+    final long jgitBytes = WindowCacheStatAccessor.getOpenBytes();
 
     p.println("JGit Buffer Cache:");
     fItemCount("open files", WindowCacheStatAccessor.getOpenFiles());
diff --git a/src/main/java/org/spearce/jgit/lib/WindowCacheStatAccessor.java b/src/main/java/org/spearce/jgit/lib/WindowCacheStatAccessor.java
index c30330873a..4cd03d6291 100644
--- a/src/main/java/org/spearce/jgit/lib/WindowCacheStatAccessor.java
+++ b/src/main/java/org/spearce/jgit/lib/WindowCacheStatAccessor.java
@@ -22,7 +22,7 @@ public class WindowCacheStatAccessor {
     return WindowCache.getInstance().getOpenFiles();
   }
 
-  public static int getOpenBytes() {
+  public static long getOpenBytes() {
     return WindowCache.getInstance().getOpenBytes();
   }