diff --git README.txt README.txt
index de066ac..0a17f89 100644
--- README.txt
+++ README.txt
@@ -5,8 +5,8 @@ features and better performance. Among the extra features is the ability to have
 faceted search on facets ranging from content author to taxonomy to arbitrary
 Field API fields.
 
-The module comes with a schema.xml and solrconfig.xml file which must be used
-in your Solr installation.
+The module comes with a schema.xml, solrconfig.xml, and protwords.txt file which
+must be used in your Solr installation.
 
 This module depends on the search framework in core.  When used in combination
 with core search module, Apache Solr is not the default search. Access it via a
@@ -98,19 +98,6 @@ apache-solr-1.4.1/example, and executing the command java -jar start.jar
 Test that your solr server is now available by visiting
 http://localhost:8983/solr/admin/
 
-For those using PHP 5.1, you must either install the PECL json extension
-into PHP on your sever, or you may use the Zend framework Json library.
-for the PECL extension see:  http://pecl.php.net/package/json
-The Solr client has been tested with Zend framework release 1.7.7.
-To get this code, you may use svn from the apachesolr directory:
-svn co http://framework.zend.com/svn/framework/standard/tags/release-1.7.7/library/Zend
-However, the only required parts are:
-http://framework.zend.com/svn/framework/standard/tags/release-1.7.7/library/Zend/Exception.php
-http://framework.zend.com/svn/framework/standard/tags/release-1.7.7/library/Zend/Json/
-The 'Zend' directory should normally be under the apachesolr
-directory, but may be elsewhere if you set that location to be
-in your PHP include path.
-
 Now, you should enable the "Apache Solr framework" and "Apache Solr search" 
 modules. Check that you can connect to Solr at ?q=admin/setting/apachesolr
 Now run cron on your Drupal site until your content is indexed. You
diff --git apachesolr.module apachesolr.module
index 5dcc73b..7a03594 100644
--- apachesolr.module
+++ apachesolr.module
@@ -1911,8 +1911,12 @@ function apachesolr_do_query($caller, DrupalSolrQueryInterface $current_query, $
     }
   }
   // We must run htmlspecialchars() here since converted entities are in the index.
-  // and thus bare entities &, > or < won't match.
-  $response = $query->search(htmlspecialchars($keys, ENT_QUOTES, 'UTF-8'));
+  // and thus bare entities &, > or < won't match. Single quotes are converted
+  // too, but not double quotes since the dismax parser looks at them for
+  // phrase queries.
+  $keys = htmlspecialchars($keys, ENT_NOQUOTES, 'UTF-8');
+  $keys = str_replace("'", '&#039;', $keys);
+  $response = $query->search($keys);
   // The response is cached so that it is accessible to the blocks and anything
   // else that needs it beyond the initial search.
   apachesolr_static_response_cache($response, $caller);