diff --git a/spi.quicksearch/apichanges.xml b/spi.quicksearch/apichanges.xml
new file mode 100644
--- /dev/null
+++ b/spi.quicksearch/apichanges.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License.  When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+
+Contributor(s):
+
+Portions Copyrighted 2014 Sun Microsystems, Inc.
+-->
+
+<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd">
+
+<!--
+
+INFO FOR PEOPLE ADDING CHANGES:
+
+Check the DTD (apichanges.dtd) for details on the syntax. You do not
+need to regenerate the HTML, as this is part of Javadoc generation; just
+change the XML. Rough syntax of a change (several parts optional):
+
+<change>
+    <api name="compiler"/>
+    <summary>Some brief description here, can use <b>XHTML</b></summary>
+    <version major="1" minor="99"/>
+    <date day="13" month="6" year="2001"/>
+    <author login="jrhacker"/>
+    <compatibility addition="yes"/>
+    <description>
+        The main description of the change here.
+        Again can use full <b>XHTML</b> as needed.
+    </description>
+    <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+    <issue number="14309"/>
+</change>
+
+Also permitted elements: <package>, <branch>. <version> is API spec
+version, recommended for all new changes. <compatibility> should say
+if things were added/modified/deprecated/etc. and give all information
+related to upgrading old code. List affected top-level classes and
+link to issue numbers if applicable. See the DTD for more details.
+
+Changes need not be in any particular order, they are sorted in various
+ways by the stylesheet anyway.
+
+Dates are assumed to mean "on the trunk". If you *also* make the same
+change on a stabilization branch, use the <branch> tag to indicate this
+and explain why the change was made on a branch in the <description>.
+
+Please only change this file on the trunk! Rather: you can change it
+on branches if you want, but these changes will be ignored; only the
+trunk version of this file is important.
+
+Deprecations do not count as incompatible, assuming that code using the
+deprecated calls continues to see their documented behavior. But do
+specify deprecation="yes" in <compatibility>.
+
+This file is not a replacement for Javadoc: it is intended to list changes,
+not describe the complete current behavior, for which ordinary documentation
+is the proper place.
+
+-->
+
+<apichanges>
+
+    <!-- First, a list of API names you may use: -->
+    <apidefs>
+        <apidef name="spi.quicksearch">Quick Search API</apidef>
+    </apidefs>
+
+    <!-- ACTUAL CHANGES BEGIN HERE: -->
+
+    <changes>
+
+        <change id="SearchRequest.getMaxResults">
+            <api name="spi.quicksearch"/>
+            <summary>Add methods for working with results limit</summary>
+            <version major="1" minor="24"/>
+            <date day="23" month="5" year="2014"/>
+            <author login="jhavlin"/>
+            <compatibility addition="yes"/>
+            <description>
+                <p>
+                    Some search providers can perform some optimizations if
+                    they know what is the limit on number of search results
+                    in advance. So there is new method
+                    SearchRequest.getMaxResults to retrieve the current limit,
+                    and method SearchResponse.setMoreResults to explicitly
+                    inform that there are more results not added to the
+                    SearchResponse.
+                </p>
+            </description>
+            <class package="org.netbeans.spi.quicksearch" name="SearchRequest"/>
+            <class package="org.netbeans.spi.quicksearch" name="SearchResponse"/>
+            <issue number="244432"/>
+        </change>
+    </changes>
+
+    <htmlcontents>
+        <!--
+                            NO NO NO NO NO!
+
+         ==============>    DO NOT EDIT ME!  <==============
+
+          AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
+
+                SEE openide/io/api/doc/changes/changes.xml
+        -->
+        <head>
+            <title>Change History for the Quick Search API</title>
+            <link rel="stylesheet" href="prose.css" type="text/css"/>
+        </head>
+        <body>
+
+            <p class="overviewlink">
+                <a href="overview-summary.html">Overview</a>
+            </p>
+
+            <h1>Introduction</h1>
+
+            <p>This document lists changes made to the <a href="@org-netbeans-spi-quicksearch@/index.html">Quick Search API</a>.</p>
+
+            <!-- The actual lists of changes, as summaries and details: -->
+            <hr/>
+            <standard-changelists module-code-name="org.netbeans.spi.quicksearch"/>
+
+            <hr/>
+            <p>@FOOTER@</p>
+        </body>
+    </htmlcontents>
+
+</apichanges>
diff --git a/spi.quicksearch/manifest.mf b/spi.quicksearch/manifest.mf
--- a/spi.quicksearch/manifest.mf
+++ b/spi.quicksearch/manifest.mf
@@ -2,5 +2,5 @@
 OpenIDE-Module: org.netbeans.spi.quicksearch
 OpenIDE-Module-Layer: org/netbeans/modules/quicksearch/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/spi/quicksearch/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
 
diff --git a/spi.quicksearch/nbproject/project.properties b/spi.quicksearch/nbproject/project.properties
--- a/spi.quicksearch/nbproject/project.properties
+++ b/spi.quicksearch/nbproject/project.properties
@@ -2,5 +2,6 @@
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.arch=${basedir}/arch.xml
+javadoc.apichanges=${basedir}/apichanges.xml
 
 test.config.stableBTD.includes=**/*Test.class
diff --git a/spi.quicksearch/src/org/netbeans/modules/quicksearch/Accessor.java b/spi.quicksearch/src/org/netbeans/modules/quicksearch/Accessor.java
--- a/spi.quicksearch/src/org/netbeans/modules/quicksearch/Accessor.java
+++ b/spi.quicksearch/src/org/netbeans/modules/quicksearch/Accessor.java
@@ -71,7 +71,7 @@
 //        assert DEFAULT != null : "The DEFAULT field must be initialized";
     }
     
-    public abstract SearchRequest createRequest (String text, List<? extends KeyStroke> stroke);
+    public abstract SearchRequest createRequest (String text, List<? extends KeyStroke> stroke, int maxResults);
     
     public abstract SearchResponse createResponse (CategoryResult catResult, SearchRequest sRequest);
         
diff --git a/spi.quicksearch/src/org/netbeans/modules/quicksearch/CategoryResult.java b/spi.quicksearch/src/org/netbeans/modules/quicksearch/CategoryResult.java
--- a/spi.quicksearch/src/org/netbeans/modules/quicksearch/CategoryResult.java
+++ b/spi.quicksearch/src/org/netbeans/modules/quicksearch/CategoryResult.java
@@ -47,7 +47,9 @@
 import java.util.List;
 import javax.swing.SwingUtilities;
 import org.netbeans.modules.quicksearch.ResultsModel.ItemResult;
+import org.netbeans.spi.quicksearch.SearchRequest;
 import org.openide.util.NbBundle;
+import sun.awt.FontConfiguration;
 
 /**
  * Thread safe model of provider results of asociated category.
@@ -175,4 +177,15 @@
         
     }
 
+    /**
+     * Inform that there are more results to add, but they won't be added
+     * because of exceeded limit on number of items.
+     *
+     * @see SearchRequest#getMaxResults().
+     */
+    public void setMoreResults() {
+        if (!allResults) {
+            moreResults = true;
+        }
+    }
 }
diff --git a/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java b/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
--- a/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
+++ b/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
@@ -98,11 +98,12 @@
     public static org.openide.util.Task evaluate (String command, ResultsModel model) {
         List<CategoryResult> l = new ArrayList<CategoryResult>();
         String[] commands = parseCommand(command);
-        SearchRequest sRequest = Accessor.DEFAULT.createRequest(commands[1], null);
         List<Task> tasks = new ArrayList<Task>();
 
         List<Category> provCats = new ArrayList<Category>();
         boolean allResults = getProviderCategories(commands, provCats);
+        SearchRequest sRequest = Accessor.DEFAULT.createRequest(commands[1], null,
+                (allResults ? CategoryResult.ALL_MAX_RESULTS : CategoryResult.MAX_RESULTS));
 
         for (ProviderModel.Category curCat : provCats) {
             CategoryResult catResult = new CategoryResult(curCat, allResults);
diff --git a/spi.quicksearch/src/org/netbeans/spi/quicksearch/AccessorImpl.java b/spi.quicksearch/src/org/netbeans/spi/quicksearch/AccessorImpl.java
--- a/spi.quicksearch/src/org/netbeans/spi/quicksearch/AccessorImpl.java
+++ b/spi.quicksearch/src/org/netbeans/spi/quicksearch/AccessorImpl.java
@@ -58,8 +58,8 @@
 class AccessorImpl extends Accessor {
 
     @Override
-    public SearchRequest createRequest (String text, List<? extends KeyStroke> stroke) {
-        return new SearchRequest(text, stroke);
+    public SearchRequest createRequest (String text, List<? extends KeyStroke> stroke, int maxResults) {
+        return new SearchRequest(text, stroke, maxResults);
     }
 
     @Override
diff --git a/spi.quicksearch/src/org/netbeans/spi/quicksearch/SearchRequest.java b/spi.quicksearch/src/org/netbeans/spi/quicksearch/SearchRequest.java
--- a/spi.quicksearch/src/org/netbeans/spi/quicksearch/SearchRequest.java
+++ b/spi.quicksearch/src/org/netbeans/spi/quicksearch/SearchRequest.java
@@ -63,14 +63,16 @@
     }    
     
     /** Text to search for */
-    private String text;
+    private final String text;
+    private final int maxResults;
     
     /** Shortcut to search for */
-    private List <? extends KeyStroke> stroke;
+    private final List <? extends KeyStroke> stroke;
 
-    SearchRequest (String text, List<? extends KeyStroke> stroke) {
+    SearchRequest (String text, List<? extends KeyStroke> stroke, int maxResults) {
         this.text = text;
         this.stroke = stroke;
+        this.maxResults = maxResults;
     }
 
     /**
@@ -93,4 +95,18 @@
         return stroke;
     }
 
+    /**
+     * Get maximal number of results that can be displayed under current
+     * circumstances. You can use this information to optimize you search. But
+     * remember that it is sometimes important to know whether there are more
+     * results than the current limit L. So either add L+1 results, or call
+     * method {@link SearchResponse#setMoreResults()}.
+     *
+     * @return The current limit on number of displayable results.
+     * @see SearchResponse#setMoreResults()
+     * @since spi.quicksearch/1.24
+     */
+    public int getMaxResults() {
+        return maxResults;
+    }
 }
diff --git a/spi.quicksearch/src/org/netbeans/spi/quicksearch/SearchResponse.java b/spi.quicksearch/src/org/netbeans/spi/quicksearch/SearchResponse.java
--- a/spi.quicksearch/src/org/netbeans/spi/quicksearch/SearchResponse.java
+++ b/spi.quicksearch/src/org/netbeans/spi/quicksearch/SearchResponse.java
@@ -57,8 +57,8 @@
  */
 public final class SearchResponse {
 
-    private CategoryResult catResult;
-    private SearchRequest sRequest;
+    private final CategoryResult catResult;
+    private final SearchRequest sRequest;
    
     /** Package private creation, made available to other packages via
      * Accessor pattern.
@@ -123,4 +123,14 @@
                 htmlDisplayName, shortcut, displayHint));
     }
 
+    /**
+     * Inform that there are more results to add, but they won't be added
+     * because of exceeded limit on number of items.
+     *
+     * @see SearchRequest#getMaxResults().
+     * @since spi.quicksearch/1.24
+     */
+    public void setMoreResults() {
+        catResult.setMoreResults();
+    }
 }
diff --git a/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/ResultsModelTest.java b/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/ResultsModelTest.java
--- a/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/ResultsModelTest.java
+++ b/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/ResultsModelTest.java
@@ -131,7 +131,7 @@
         assertHTML("<html>leave my keys alone!", "<html>leave my keys alone!", "key");
     }
     private void assertHTML(String displayed, String provided, String searched) {
-        assertEquals(displayed, new ResultsModel.ItemResult(null, Accessor.DEFAULT.createRequest(searched, null), null, provided).getDisplayName());
+        assertEquals(displayed, new ResultsModel.ItemResult(null, Accessor.DEFAULT.createRequest(searched, null, 7), null, provided).getDisplayName());
     }
 
 }