diff --git a/CHANGES b/CHANGES
index d6f1e740b4..b1a486cd0e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@ Changes included in OpenLDAP 1.2.12 Engineering
 	Fixed Pth initialization bug
 	Fixed libldap/add mod_bvalues typo
 	Fixed ldappasswd crypt(3) crash (ITD#598)
+	Fixed MAXARGS boundary condition crash in fp_parse_line in
+		servers/slapd/config.c
 	Build Environment
 		Remove extra Digital UNIX symbol (ITS#590)
 		Ignore make clean rm failure
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 69fa445694..38639502fa 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -39,7 +39,7 @@ read_config( char *fname, Backend **bep, FILE *pfp )
 	FILE	*fp;
 	char	*line, *savefname;
 	int	cargc, savelineno;
-	char	*cargv[MAXARGS];
+	char	*cargv[MAXARGS+1];
 	int	lineno, i;
 	Backend	*be;