diff --git a/CHANGES b/CHANGES
index e50a7453df7609919732e349dd797c2372ef6916..5bc91014de1d632413cdcd1854750b9cf7d26b9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@ OpenLDAP 2.4.6 Engineering
 	Build Environment
 		Use separate config OID arc for contrib (ITS#5158)
 		Updated contrib/ldapc++ build enviroment
+		Updated Makefiles
 	Documentation
 		Fixed slapd-bdb(5) note about dbconfig directives (ITS#5134)
 		slapadd/slapindex note about file ownership (ITS#5166)
diff --git a/servers/slapd/back-hdb/Makefile.in b/servers/slapd/back-hdb/Makefile.in
index 31e2e50caf5ddb1099400c074b89dca3b3dffaac..a2c1b18b560487dc49881dde804d59409e683fd0 100644
--- a/servers/slapd/back-hdb/Makefile.in
+++ b/servers/slapd/back-hdb/Makefile.in
@@ -59,7 +59,7 @@ LIBBASE = back_hdb
 XINCPATH = -I.. -I$(srcdir)/.. -I$(srcdir) -I$(XXDIR)
 XDEFS = $(MODULES_CPPFLAGS)
 
-depend-common: .links
+depend-local-lib: .links
 
 all-local-lib:	../.backend
 
diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
index 3321f968a46ca270f4465cd2df6b5b5483be5f16..8e0af0e8093f9d0cf797083ce9b6b10c5309dfad 100644
--- a/servers/slapd/overlays/Makefile.in
+++ b/servers/slapd/overlays/Makefile.in
@@ -132,7 +132,7 @@ $(LIBRARY): $(OBJS) version.lo
 	$(AR) rs $@ $(OBJS)
 
 # Must fixup depends for non-libtool objects
-depend-local:
+depend-local: depend-common
 	@if test -n "$(OBJS)"; then \
 	OBJ2=`echo $(OBJS) $(OBJDEP) | $(SED) -e 's/\.o//g'`; \
 	SCR=''; for i in $$OBJ2; do SCR="$$SCR -e s/^$$i.lo:/$$i.o:/"; done; \