diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index dfc154693c8..3b6ce8aa5cf 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -260,6 +260,9 @@ Other Changes
 
 * SOLR-2027: FacetField.getValues() now returns an empty list if there are no
   values, instead of null (Chris Male)
+
+* SOLR-1825: SolrQuery.addFacetQuery now enables facets automatically, like
+  addFacetField (Chris Male)
   
 Documentation
 ----------------------
diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java b/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java
index a7228f0da9d..5771028741f 100644
--- a/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java
+++ b/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java
@@ -292,6 +292,7 @@ public class SolrQuery extends ModifiableSolrParams
    */
   public SolrQuery addFacetQuery(String f) {
     this.add(FacetParams.FACET_QUERY, f);
+    this.set(FacetParams.FACET, true);
     return this;
   }
 
diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java b/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
index 9c24c4d9c0c..4eedeb9a57c 100644
--- a/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
+++ b/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
@@ -195,4 +195,10 @@ public class SolrQueryTest extends LuceneTestCase {
     q.setTermsRegexFlag("multiline");
     assertEquals(2, q.getTermsRegexFlags().length);
   }
+
+  public void testAddFacetQuery() {
+    SolrQuery solrQuery = new SolrQuery();
+    solrQuery.addFacetQuery("field:value");
+    assertTrue("Adding a Facet Query should enable facets", solrQuery.getBool(FacetParams.FACET));
+  }
 }