Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java	(revision 645290)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java	(working copy)
@@ -387,8 +387,8 @@
             String textsearch = node.getQuery();
             // the default lucene query parser recognizes 'AND' and 'NOT' as
             // keywords.
-            textsearch = textsearch.replaceAll("AND", "and");
-            textsearch = textsearch.replaceAll("NOT", "not");
+            textsearch = textsearch.replaceAll("\\band\\b", "AND");
+            textsearch = textsearch.replaceAll("\\bnot\\b", "NOT");
             boolean escaped = false;
             for (int i = 0; i < textsearch.length(); i++) {
                 if (textsearch.charAt(i) == '\\') {