diff --git a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
index 69c336d5a..0de1bc24c 100644
--- a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
+++ b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
@@ -34,6 +34,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Transient;
+import javax.persistence.Version;
 import javax.persistence.metamodel.Metamodel;
 
 import org.springframework.data.annotation.AccessType.Type;
@@ -174,6 +175,15 @@ class JpaPersistentPropertyImpl extends AnnotationBasedPersistentProperty<JpaPer
 		return usePropertyAccess != null ? usePropertyAccess : super.usePropertyAccess();
 	}
 
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#isVersionProperty()
+	 */
+	@Override
+	public boolean isVersionProperty() {
+		return isAnnotationPresent(Version.class) || super.isVersionProperty();
+	}
+
 	/**
 	 * Looks up both Spring Data's and JPA's access type definition annotations on the property or type level to determine
 	 * the access type to be used. Will consider property-level annotations over type-level ones, favoring the Spring Data
diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java
index 57712638f..2c34a95f6 100644
--- a/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java
@@ -32,6 +32,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.data.annotation.AccessType.Type;
+import org.springframework.data.annotation.Version;
 
 /**
  * Unit tests for {@link JpaPersistentPropertyImpl}.
@@ -142,6 +143,22 @@ public class JpaPersistentPropertyImplUnitTests {
 		assertThat(getProperty(CompetingPropertyLevelAnnotations.class, "id").usePropertyAccess(), is(false));
 	}
 
+	/**
+	 * @see DATAJPA-605
+	 */
+	@Test
+	public void detectsJpaVersionAnnotation() {
+		assertThat(getProperty(JpaVersioned.class, "version").isVersionProperty(), is(true));
+	}
+
+	/**
+	 * @see DATAJPA-605
+	 */
+	@Test
+	public void detectsSpringDataVersionAnnotation() {
+		assertThat(getProperty(SpringDataVersioned.class, "version").isVersionProperty(), is(true));
+	}
+
 	private JpaPersistentProperty getProperty(Class<?> ownerType, String propertyName) {
 
 		JpaPersistentEntity<?> entity = context.getPersistentEntity(ownerType);
@@ -241,4 +258,14 @@ public class JpaPersistentPropertyImplUnitTests {
 			return id;
 		}
 	}
+
+	static class SpringDataVersioned {
+
+		@Version long version;
+	}
+
+	static class JpaVersioned {
+
+		@Version long version;
+	}
 }