diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 9909b2dc76..da0d71040e 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -58,10 +58,11 @@
 
 LDAP_BEGIN_DECL
 
-#ifdef LDAP_DEVEL
 #define SLAP_ACL_HONOR_DISCLOSE	/* partially implemented */
+
+#ifdef LDAP_DEVEL
 #define SLAP_DYNACL
-#define LDAP_COMP_MATCH			/* experimental */
+#define LDAP_COMP_MATCH
 #define LDAP_DYNAMIC_OBJECTS
 #define LDAP_SYNC_TIMESTAMP
 #define LDAP_COLLECTIVE_ATTRIBUTES