diff --git a/configure.in b/configure.in
index e3083d0332c88660c3dc67cfa213fae20f7e4463..7b05c96c94dd714828144d9df12eab84a82a6ffe 100644
--- a/configure.in
+++ b/configure.in
@@ -242,11 +242,16 @@ OL_ARG_ENABLE(lastmod,[    --enable-lastmod	  Last Modification overlay no|yes|m
 OL_ARG_ENABLE(ppolicy,[    --enable-ppolicy	  Password Policy overlay no|yes|mod], no,
 	[no yes mod])
 OL_ARG_ENABLE(proxycache,[    --enable-proxycache	  Proxy Cache overlay no|yes|mod], no,
+	[no yes mod])
 OL_ARG_ENABLE(refint,[    --enable-refint	  Referential Integrity overlay no|yes|mod], no,
 	[no yes mod])
 OL_ARG_ENABLE(rwm,[    --enable-rwm       	  Rewrite/Remap overlay no|yes|mod], no,
-OL_ARG_ENABLE(unique,[    --enable-unique       	  Attribute Uniqueness overlay no|yes|mod], no,
 	[no yes mod])
+OL_ARG_ENABLE(unique,[    --enable-unique       Attribute Uniqueness overlay no|yes|mod], no,
+	[no yes mod])
+OL_ARG_ENABLE(overlays,[    --enable-overlays     Enable all overlays no|yes|mod (overrides above)], "",
+	["" no yes mod])
+
 
 dnl ----------------------------------------------------------------
 dnl SLURPD OPTIONS
@@ -2630,6 +2635,13 @@ if test "$ol_link_sql" != no ; then
 	AC_DEFINE_UNQUOTED(SLAPD_SQL,$MFLAG,[define to support SQL backend])
 fi
 
+dnl enable all overlays
+if test "x$ol_enable_overlays" != "x" ; then
+	for i in $Overlays; do
+		eval "ol_enable_$i=$ol_enable_overlays"
+	done
+fi
+
 if test "$ol_enable_chain" != no ; then
 	BUILD_CHAIN=$ol_enable_chain
 	if test "$ol_enable_chain" = mod ; then