diff --git a/src/main/java/org/springframework/data/jpa/repository/Query.java b/src/main/java/org/springframework/data/jpa/repository/Query.java
index 6d499f822..0af1d2ae1 100644
--- a/src/main/java/org/springframework/data/jpa/repository/Query.java
+++ b/src/main/java/org/springframework/data/jpa/repository/Query.java
@@ -45,13 +45,13 @@ public @interface Query {
 
 	/**
 	 * Defines a special count query that shall be used for pagination queries to lookup the total number of elements for
-	 * a page. If non is configured we will derive the count query from the method name.
+	 * a page. If non is configured we will derive the count query from the original query or {@link #countProjection()} query if any.
 	 */
 	String countQuery() default "";
 
 	/**
 	 * Defines the projection part of the count query that is generated for pagination. If neither {@link #countQuery()}
-	 * not {@link #countProjection()} is configured we will derive the count query from the method name.
+	 * not {@link #countProjection()} is configured we will derive the count query from the original query.
 	 *
 	 * @return
 	 * @since 1.6