diff --git a/src/main/java/org/springframework/data/repository/support/Repositories.java b/src/main/java/org/springframework/data/repository/support/Repositories.java
index cdf80f304..b5ba4a36e 100644
--- a/src/main/java/org/springframework/data/repository/support/Repositories.java
+++ b/src/main/java/org/springframework/data/repository/support/Repositories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@ import org.springframework.util.ClassUtils;
  * 
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Thomas Eizinger
  */
 public class Repositories implements Iterable<Class<?>> {
 
@@ -138,11 +139,19 @@ public class Repositories implements Iterable<Class<?>> {
 
 		Assert.notNull(domainClass, DOMAIN_TYPE_MUST_NOT_BE_NULL);
 
-		RepositoryFactoryInformation<Object, Serializable> repositoryInfo = repositoryFactoryInfos.get(ClassUtils
-				.getUserClass(domainClass));
+		Class<?> classToInspect = domainClass;
+		RepositoryFactoryInformation<Object, Serializable> repositoryInfo = repositoryFactoryInfos
+				.get(ClassUtils.getUserClass(classToInspect));
+
+		while (repositoryInfo == null && !classToInspect.equals(Object.class)) {
+			classToInspect = classToInspect.getSuperclass();
+			repositoryInfo = repositoryFactoryInfos.get(ClassUtils.getUserClass(classToInspect));
+		}
+
 		return repositoryInfo == null ? EMPTY_REPOSITORY_FACTORY_INFO : repositoryInfo;
 	}
 
+
 	/**
 	 * Returns the {@link EntityInformation} for the given domain class.
 	 * 
diff --git a/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java b/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java
index fa6e8756e..078fb3550 100644
--- a/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/support/RepositoriesUnitTests.java
@@ -125,25 +125,27 @@ public class RepositoriesUnitTests {
 		repositories.getCrudInvoker(EntityWithoutRepository.class);
 	}
 
-	class Person {
+	/**
+	 * @see DATACMNS-634
+	 */
+	@Test
+	public void findsRepositoryForSubTypes() {
 
+		Repositories repositories = new Repositories(context);
+		assertThat(repositories.getPersistentEntity(AdvancedAddress.class), is(notNullValue()));
 	}
 
-	class Address {
+	class EntityWithoutRepository {}
 
-	}
+	class Person {}
 
-	class EntityWithoutRepository {
+	class Address {}
 
-	}
+	class AdvancedAddress extends Address {}
 
-	interface PersonRepository extends CrudRepository<Person, Long> {
+	interface PersonRepository extends CrudRepository<Person, Long> {}
 
-	}
-
-	interface AddressRepository extends Repository<Address, Long> {
-
-	}
+	interface AddressRepository extends Repository<Address, Long> {}
 
 	static class SampleRepoFactoryInformation<T, S extends Serializable> implements RepositoryFactoryInformation<T, S> {