diff --git a/plugins/scm-git-plugin/pom.xml b/plugins/scm-git-plugin/pom.xml
index 2274af7ac6..4d9645ce15 100644
--- a/plugins/scm-git-plugin/pom.xml
+++ b/plugins/scm-git-plugin/pom.xml
@@ -63,7 +63,7 @@
   </dependencies>
 
   <properties>
-    <jgit.version>0.10.1</jgit.version>
+    <jgit.version>0.12.1</jgit.version>
   </properties>
 
 </project>
diff --git a/plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java b/plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
index 3e79cbe3b1..1e6aed8b51 100644
--- a/plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
+++ b/plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
@@ -36,12 +36,12 @@ package sonia.scm.web;
 //~--- non-JDK imports --------------------------------------------------------
 
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
-import org.eclipse.jgit.http.server.resolver.RepositoryResolver;
-import org.eclipse.jgit.http.server.resolver.ServiceNotAuthorizedException;
-import org.eclipse.jgit.http.server.resolver.ServiceNotEnabledException;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.RepositoryCache;
 import org.eclipse.jgit.lib.RepositoryCache.FileKey;
+import org.eclipse.jgit.transport.resolver.RepositoryResolver;
+import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
+import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
 import org.eclipse.jgit.util.FS;
 
 import sonia.scm.repository.GitConfig;
@@ -57,7 +57,8 @@ import javax.servlet.http.HttpServletRequest;
  *
  * @author Sebastian Sdorra
  */
-public class GitRepositoryResolver implements RepositoryResolver
+public class GitRepositoryResolver
+        implements RepositoryResolver<HttpServletRequest>
 {
 
   /**
diff --git a/plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java b/plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java
index b91f201121..89d769cd53 100644
--- a/plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java
+++ b/plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java
@@ -39,8 +39,8 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import org.eclipse.jgit.http.server.GitServlet;
-import org.eclipse.jgit.http.server.resolver.RepositoryResolver;
 import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.transport.resolver.RepositoryResolver;
 
 import sonia.scm.repository.GitRepositoryHandler;
 import sonia.scm.util.HttpUtil;
@@ -172,5 +172,5 @@ public class ScmGitServlet extends GitServlet
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private RepositoryResolver resolver;
+  private RepositoryResolver<HttpServletRequest> resolver;
 }