diff --git a/CHANGES.txt b/CHANGES.txt
index dbb403b3772..15e5f3f5cf0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -140,6 +140,8 @@ Bug Fixes
     both the index and query analyzers to fix the bug with phrase queries
     with stopwords. (yonik)
 
+13. SOLR-836: Add missing "a" to the example stopwords.txt (yonik)
+
 
 Other Changes
 ----------------------
diff --git a/client/ruby/solr-ruby/solr/conf/stopwords.txt b/client/ruby/solr-ruby/solr/conf/stopwords.txt
index 8433c832d2c..b5824da3263 100644
--- a/client/ruby/solr-ruby/solr/conf/stopwords.txt
+++ b/client/ruby/solr-ruby/solr/conf/stopwords.txt
@@ -20,6 +20,7 @@ stopworda
 stopwordb
 
 #Standard english stop words taken from Lucene's StopAnalyzer
+a
 an
 and
 are
diff --git a/client/ruby/solr-ruby/test/conf/stopwords.txt b/client/ruby/solr-ruby/test/conf/stopwords.txt
index 8433c832d2c..b5824da3263 100644
--- a/client/ruby/solr-ruby/test/conf/stopwords.txt
+++ b/client/ruby/solr-ruby/test/conf/stopwords.txt
@@ -20,6 +20,7 @@ stopworda
 stopwordb
 
 #Standard english stop words taken from Lucene's StopAnalyzer
+a
 an
 and
 are
diff --git a/contrib/javascript/example/testsolr/solr/conf/stopwords.txt b/contrib/javascript/example/testsolr/solr/conf/stopwords.txt
index 8433c832d2c..b5824da3263 100644
--- a/contrib/javascript/example/testsolr/solr/conf/stopwords.txt
+++ b/contrib/javascript/example/testsolr/solr/conf/stopwords.txt
@@ -20,6 +20,7 @@ stopworda
 stopwordb
 
 #Standard english stop words taken from Lucene's StopAnalyzer
+a
 an
 and
 are
diff --git a/contrib/velocity/src/main/solr/conf/stopwords.txt b/contrib/velocity/src/main/solr/conf/stopwords.txt
index 8433c832d2c..b5824da3263 100644
--- a/contrib/velocity/src/main/solr/conf/stopwords.txt
+++ b/contrib/velocity/src/main/solr/conf/stopwords.txt
@@ -20,6 +20,7 @@ stopworda
 stopwordb
 
 #Standard english stop words taken from Lucene's StopAnalyzer
+a
 an
 and
 are
diff --git a/example/example-DIH/solr/db/conf/stopwords.txt b/example/example-DIH/solr/db/conf/stopwords.txt
index 8433c832d2c..b5824da3263 100644
--- a/example/example-DIH/solr/db/conf/stopwords.txt
+++ b/example/example-DIH/solr/db/conf/stopwords.txt
@@ -20,6 +20,7 @@ stopworda
 stopwordb
 
 #Standard english stop words taken from Lucene's StopAnalyzer
+a
 an
 and
 are
diff --git a/example/example-DIH/solr/rss/conf/stopwords.txt b/example/example-DIH/solr/rss/conf/stopwords.txt
index 8433c832d2c..b5824da3263 100644
--- a/example/example-DIH/solr/rss/conf/stopwords.txt
+++ b/example/example-DIH/solr/rss/conf/stopwords.txt
@@ -20,6 +20,7 @@ stopworda
 stopwordb
 
 #Standard english stop words taken from Lucene's StopAnalyzer
+a
 an
 and
 are
diff --git a/example/solr/conf/stopwords.txt b/example/solr/conf/stopwords.txt
index 8433c832d2c..b5824da3263 100644
--- a/example/solr/conf/stopwords.txt
+++ b/example/solr/conf/stopwords.txt
@@ -20,6 +20,7 @@ stopworda
 stopwordb
 
 #Standard english stop words taken from Lucene's StopAnalyzer
+a
 an
 and
 are