diff --git a/CHANGES b/CHANGES
index 06dfbc774e0ca672df9f3c343027eb1dd9272c10..5eef4336a27fdf5de95cca14f5782c5033b31ed4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.11 Engineering
 	Added slapo-nssov contrib module
+	Fixed slapo-ppolicy DNs with whitespaces (ITS#5552)
 	Build Environment
 		Fixed test048 to skip if threads is not available (ITS#5529)
 
diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index 6f96c02426106e5781df2d39288ea67b4b5c1ef2..8fc7b33b13a94e2f0e4e8a9a888b7f8f01013c6b 100644
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -214,7 +214,7 @@ static ConfigDriver ppolicy_cf_default;
 
 static ConfigTable ppolicycfg[] = {
 	{ "ppolicy_default", "policyDN", 2, 2, 0,
-	  ARG_DN|ARG_MAGIC|PPOLICY_DEFAULT, ppolicy_cf_default,
+	  ARG_DN|ARG_QUOTE|ARG_MAGIC|PPOLICY_DEFAULT, ppolicy_cf_default,
 	  "( OLcfgOvAt:12.1 NAME 'olcPPolicyDefault' "
 	  "DESC 'DN of a pwdPolicy object for uncustomized objects' "
 	  "SYNTAX OMsDN SINGLE-VALUE )", NULL, NULL },