Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java	(revision 1545590)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java	(working copy)
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 import javax.jcr.query.InvalidQueryException;
 import javax.xml.parsers.DocumentBuilder;
@@ -1552,14 +1553,18 @@
                                     String value = new String(termAttribute.termBuffer(), 0, termAttribute.termLength());
                                     if (value.startsWith(namePrefix)) {
                                         // extract value
-                                        value = value.substring(namePrefix.length());
+                                        String rawValue = value.substring(namePrefix.length());
                                         // create new named value
                                         Path p = getRelativePath(state, propState);
                                         String path = getNamespaceMappings().translatePath(p);
-                                        value = FieldNames.createNamedValue(path, value);
+                                        value = FieldNames.createNamedValue(path, rawValue);
                                         termAttribute.setTermBuffer(value);
+                                        PropertyMetaData pdm = PropertyMetaData
+                                                .fromByteArray(payloadAttribute
+                                                        .getPayload().getData());
                                         doc.add(new Field(field.name(),
-                                                new SingletonTokenStream(value, (Payload) payloadAttribute.getPayload().clone())));
+                                                new SingletonTokenStream(value,
+                                                        pdm.getPropertyType())));
                                         doc.add(new Field(
                                                 FieldNames.AGGREGATED_NODE_UUID,
                                                 false,
@@ -1567,6 +1572,17 @@
                                                 Field.Store.NO,
                                                 Field.Index.NOT_ANALYZED_NO_NORMS,
                                                 Field.TermVector.NO));
+                                        if (pdm.getPropertyType() == PropertyType.STRING) {
+                                            // add to fulltext index
+                                            Field ft = new Field(
+                                                    FieldNames.FULLTEXT,
+                                                    false,
+                                                    rawValue,
+                                                    Field.Store.YES,
+                                                    Field.Index.ANALYZED_NO_NORMS,
+                                                    Field.TermVector.NO);
+                                            doc.add(ft);
+                                        }
                                     }
                                 }
                             } finally {
Index: jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java
===================================================================
--- jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java	(revision 1545590)
+++ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/SQL2IndexingAggregateTest.java	(working copy)
@@ -353,4 +353,18 @@
                 + "]) and type = 'testnode' ";
         checkResult(qm.createQuery(sql, JCR_SQL2).execute(), 1);
     }
+
+    public void testAggregatedProperty() throws Exception {
+
+        Node parent = testRootNode.addNode("parent",
+                JcrConstants.NT_UNSTRUCTURED);
+        Node child = parent.addNode("child", JcrConstants.NT_UNSTRUCTURED);
+        child.setProperty("property",
+                "the quick brown fox jumps over the lazy dog.");
+        testRootNode.getSession().save();
+
+        String sql = "SELECT * FROM [nt:unstructured] as u WHERE CONTAINS (u.*, 'dog') ";
+        executeSQL2Query(sql, new Node[] { parent, child });
+    }
+
 }