diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index c4c5fb01aa..fdd53ded16 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -353,6 +353,14 @@ do_search(
 	slapi_pblock_set( pb, SLAPI_SEARCH_ATTRSONLY, (void *)attrsonly );
 	slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(1) );
 
+	/*
+	 * XXX FIXME: do we call this here? Awaiting clarification
+	 * from Sun.
+	 *
+	 * Rewrite filter for any computed attributes.
+	 */
+	doPluginFNs( be, SLAPI_PLUGIN_COMPUTE_SEARCH_REWRITER_FN, pb );
+
 	rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_SEARCH_FN, pb );
 	if ( rc != 0 ) {
 		/*