diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml
index c972fe52..185449d9 100644
--- a/spring-cloud-config-dependencies/pom.xml
+++ b/spring-cloud-config-dependencies/pom.xml
@@ -38,8 +38,7 @@
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
-			<!--<version>4.6.0.201612231935-r</version>-->
-			<version>3.6.1.201501031845-r</version>
+			<version>4.8.0.201706111038-r</version>
 		</dependency>
 		<dependency>
 			<groupId>org.tmatesoft.svnkit</groupId>
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java
index 1e7c33c5..f71b0ad4 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java
@@ -210,7 +210,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 				checkout(git, label);
 			}
 			// always return what is currently HEAD as the version
-			return git.getRepository().getRef("HEAD").getObjectId().getName();
+			return git.getRepository().findRef("HEAD").getObjectId().getName();
 		}
 		catch (RefNotFoundException e) {
 			throw new NoSuchLabelException("No such label: " + label, e);
@@ -338,7 +338,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 	private MergeResult merge(Git git, String label) {
 		try {
 			MergeCommand merge = git.merge();
-			merge.include(git.getRepository().getRef("origin/" + label));
+			merge.include(git.getRepository().findRef("origin/" + label));
 			MergeResult result = merge.call();
 			if (!result.getMergeStatus().isSuccessful()) {
 				this.logger.warn("Merged from remote " + label + " with result "
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
index 4e68a384..bb0f852b 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
@@ -377,9 +377,9 @@ public class JGitEnvironmentRepositoryTests {
 																		// testing
 
 		// refresh()->return
-		// git.getRepository().getRef("HEAD").getObjectId().getName();
+		// git.getRepository().findRef("HEAD").getObjectId().getName();
 		Ref headRef = mock(Ref.class);
-		when(repository.getRef(anyString())).thenReturn(headRef);
+		when(repository.findRef(anyString())).thenReturn(headRef);
 
 		ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 });
 		when(headRef.getObjectId()).thenReturn(newObjectId);
@@ -433,9 +433,9 @@ public class JGitEnvironmentRepositoryTests {
 		when(git.merge()).thenReturn(mergeCommand);
 		when(mergeCommand.call()).thenThrow(new NotMergedException()); //here is our exception we are testing
 
-		//refresh()->return git.getRepository().getRef("HEAD").getObjectId().getName();
+		//refresh()->return git.getRepository().findRef("HEAD").getObjectId().getName();
 		Ref headRef = mock(Ref.class);
-		when(repository.getRef(anyString())).thenReturn(headRef);
+		when(repository.findRef(anyString())).thenReturn(headRef);
 
 		ObjectId newObjectId = ObjectId.fromRaw(new int[]{1,2,3,4,5});
 		when(headRef.getObjectId()).thenReturn(newObjectId);
@@ -501,9 +501,9 @@ public class JGitEnvironmentRepositoryTests {
 		when(resetCommand.call()).thenReturn(ref);
 
 		// refresh()->return
-		// git.getRepository().getRef("HEAD").getObjectId().getName();
+		// git.getRepository().findRef("HEAD").getObjectId().getName();
 		Ref headRef = mock(Ref.class);
-		when(repository.getRef(anyString())).thenReturn(headRef);
+		when(repository.findRef(anyString())).thenReturn(headRef);
 
 		ObjectId newObjectId = ObjectId.fromRaw(new int[] { 1, 2, 3, 4, 5 });
 		when(headRef.getObjectId()).thenReturn(newObjectId);