diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 7360e06fcb..5699329c6e 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -28,7 +28,9 @@ static SLAP_CTRL_PARSE_FN parseAssert;
 static SLAP_CTRL_PARSE_FN parsePreRead;
 static SLAP_CTRL_PARSE_FN parsePostRead;
 static SLAP_CTRL_PARSE_FN parseProxyAuthz;
+#ifdef LDAP_DEVEL
 static SLAP_CTRL_PARSE_FN parseManageDIT;
+#endif
 static SLAP_CTRL_PARSE_FN parseManageDSAit;
 static SLAP_CTRL_PARSE_FN parseModifyIncrement;
 static SLAP_CTRL_PARSE_FN parseNoOp;
@@ -162,10 +164,12 @@ static struct slap_control control_defs[] = {
 		SLAP_CTRL_HIDE|SLAP_CTRL_MODIFY, NULL,
 		parseModifyIncrement, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #endif
+#ifdef LDAP_DEVEL
 	{ LDAP_CONTROL_MANAGEDIT,
  		(int)offsetof(struct slap_control_ids, sc_manageDIT),
 		SLAP_CTRL_GLOBAL|SLAP_CTRL_UPDATE, NULL,
 		parseManageDIT, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+#endif
 	{ LDAP_CONTROL_MANAGEDSAIT,
  		(int)offsetof(struct slap_control_ids, sc_manageDSAit),
 		SLAP_CTRL_ACCESS, NULL,
@@ -715,6 +719,7 @@ static int parseModifyIncrement (
 	return LDAP_SUCCESS;
 }
 
+#ifdef LDAP_DEVEL
 static int parseManageDIT (
 	Operation *op,
 	SlapReply *rs,
@@ -736,6 +741,7 @@ static int parseManageDIT (
 
 	return LDAP_SUCCESS;
 }
+#endif
 
 static int parseManageDSAit (
 	Operation *op,