diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/com/avaje/ebean/ExpressionList.java
index 571360ea5..98d912e48 100644
--- a/src/main/java/com/avaje/ebean/ExpressionList.java
+++ b/src/main/java/com/avaje/ebean/ExpressionList.java
@@ -260,9 +260,11 @@ public interface ExpressionList<T> extends Serializable {
   public Query<T> setMapKey(String mapKey);
 
   /**
+   * Please migrate to using {@link #findIterate()} or {@link #findVisit(QueryResultVisitor)}.
    * Set a QueryListener for bean by bean processing.
    * 
    * @see Query#setListener(QueryListener)
+   * @deprecated Migrate to {@link #findIterate()} or {@link #findVisit(QueryResultVisitor)}
    */
   public Query<T> setListener(QueryListener<T> queryListener);
 
diff --git a/src/main/java/com/avaje/ebean/Query.java b/src/main/java/com/avaje/ebean/Query.java
index 6dcfe8478..9473ddd57 100644
--- a/src/main/java/com/avaje/ebean/Query.java
+++ b/src/main/java/com/avaje/ebean/Query.java
@@ -684,7 +684,10 @@ public interface Query<T> extends Serializable {
   public Query<T> setParameter(int position, Object value);
 
   /**
+   * Please migrate to using {@link #findIterate()} or {@link #findVisit(QueryResultVisitor)}
+   * <p>
    * Set a listener to process the query on a row by row basis.
+   * </p>
    * <p>
    * Use this when you want to process a large query and do not want to hold the
    * entire query result in memory.
@@ -706,6 +709,7 @@ public interface Query<T> extends Serializable {
    * // list (emptyList) will be empty ...
    * List&lt;Order&gt; emtyList = query.findList();
    * </pre>
+   * @deprecated Deprecated in favor of {@link #findIterate()} and {@link #findVisit(QueryResultVisitor)}
    */
   public Query<T> setListener(QueryListener<T> queryListener);
 
diff --git a/src/main/java/com/avaje/ebean/QueryListener.java b/src/main/java/com/avaje/ebean/QueryListener.java
index b3c6c9795..959a3d09c 100644
--- a/src/main/java/com/avaje/ebean/QueryListener.java
+++ b/src/main/java/com/avaje/ebean/QueryListener.java
@@ -1,7 +1,10 @@
 package com.avaje.ebean;
 
 /**
+ * Deprecated, please migrate to using {@link #findIterate()} or {@link #findVisit(QueryResultVisitor)}
+ * <p>
  * Provides a mechanism for processing a query one bean at a time.
+ * </p>
  * <p>
  * This is useful when the query will return a large number of results and you
  * want to process the beans one at a time rather than whole all of the beans in
@@ -23,6 +26,8 @@ package com.avaje.ebean;
  * 
  * @param <T>
  *          the type of entity bean
+ * @deprecated Please migrate to using {@link #findIterate()} or
+ *             {@link #findVisit(QueryResultVisitor)}
  */
 public interface QueryListener<T> {