diff --git a/configure b/configure
index 798f288b8900a8063c7822135c1961130e76b606..a4e93b30f4e0cb788343122dcefad6878ea1d1e0 100755
--- a/configure
+++ b/configure
@@ -23,7 +23,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-cache	enable caching (yes)"
 ac_help="$ac_help
-  --enable-dns		enable V2 DNS  extension (no)"
+  --enable-dns		enable V2 DX Referrals extension (no)"
 ac_help="$ac_help
   --enable-referrals	enable V2 Referrals extension (yes)"
 ac_help="$ac_help
@@ -47,11 +47,11 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-yielding-select	with implicitly yielding select (auto)"
 ac_help="$ac_help
-LDAPD Options:"
+LDAPD (X.500-to-LDAP Gateway) Options:"
 ac_help="$ac_help
   --enable-ldapd	enable building ldapd (no)"
 ac_help="$ac_help
-SLAPD Options:"
+SLAPD (Standalone LDAP Daemon) Options:"
 ac_help="$ac_help
   --enable-slapd	enable building slapd (yes)"
 ac_help="$ac_help
diff --git a/configure.in b/configure.in
index 0c032f89ac8498b6aece2576eadfa4f698ad9426..38d9cf2eca90fc7d8e8c19af9e5354da08120cf4 100644
--- a/configure.in
+++ b/configure.in
@@ -71,7 +71,7 @@ dnl ol_enable_syslog=no
 OL_ARG_ENABLE(syslog,[  --enable-syslog	enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle	enable proctitle support], yes)dnl
 OL_ARG_ENABLE(cache,[  --enable-cache	enable caching], yes)dnl
-OL_ARG_ENABLE(dns,[  --enable-dns		enable V2 DNS  extension], no)dnl
+OL_ARG_ENABLE(dns,[  --enable-dns		enable V2 DX Referrals extension], no)dnl
 OL_ARG_ENABLE(referrals,[  --enable-referrals	enable V2 Referrals extension], yes)dnl
 OL_ARG_ENABLE(cldap,[  --enable-cldap	enable connectionless ldap], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile	enable cross compiling],
@@ -98,11 +98,11 @@ OL_ARG_WITH(yielding_select,[  --with-yielding-select	with implicitly yielding s
 dnl Server options
 
 dnl LDAPD OPTIONS
-AC_ARG_WITH(xxldapdoptions,[LDAPD Options:])
+AC_ARG_WITH(xxldapdoptions,[LDAPD (X.500-to-LDAP Gateway) Options:])
 OL_ARG_ENABLE(ldapd,[  --enable-ldapd	enable building ldapd], no)dnl
 
 dnl SLAPD OPTIONS
-AC_ARG_WITH(xxslapdoptions,[SLAPD Options:])
+AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) Options:])
 OL_ARG_ENABLE(slapd,[  --enable-slapd	enable building slapd], yes)dnl
 OL_ARG_ENABLE(cleartext,[    --enable-cleartext	enable cleartext passwords], yes)dnl
 OL_ARG_ENABLE(crypt,[    --enable-crypt	enable crypt(3) passwords], auto)dnl