diff --git a/build/top.mk b/build/top.mk
index cddaf16e0a..2398ca117c 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -40,7 +40,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
-moduledir = @moduledir@
+moduledir = @libexecdir@$(ldap_subdir)
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@$(ldap_subdir)
@@ -87,12 +87,10 @@ LTONLY_mod = --tag=disable-static
 LTONLY_MOD = $(LTONLY_$(BUILD_MOD))
 
 # platform-specific libtool flags
-NT_LTFLAGS = -no-undefined -avoid-version -rpath $(libdir)
-NT_LTFLAGS_LIB = -no-undefined $(LTVERSION) -rpath $(libdir)
-NT_LTFLAGS_MOD = -no-undefined $(LTVERSION) -rpath $(libdir)
-UNIX_LTFLAGS = $(LTVERSION) -rpath $(libdir)
+NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir)
+NT_LTFLAGS_MOD = -no-undefined -avoid-version -rpath $(moduledir)
 UNIX_LTFLAGS_LIB = $(LTVERSION) -rpath $(libdir)
-UNIX_LTFLAGS_MOD = $(LTVERSION) -rpath $(libdir)
+UNIX_LTFLAGS_MOD = $(LTVERSION) -rpath $(moduledir)
 
 # libtool flags
 LTFLAGS     = $(@PLAT@_LTFLAGS)
diff --git a/configure.in b/configure.in
index ece3056fb7..8d2ee0e155 100644
--- a/configure.in
+++ b/configure.in
@@ -226,24 +226,6 @@ esac
 
 AC_SUBST(ldap_subdir)dnl
 
-dnl ----------------------------------------------------------------
-dnl --with-moduledir
-
-moduledir="openldap"
-
-AC_ARG_WITH(moduledir,
-[  --with-moduledir=DIR    change default module subdirectory used for installs],
-[case "$withval" in
-	no) moduledir=""
-		;;
-	yes)
-		;;
-	*)
-		moduledir="$withval"
-		;;
-esac
-])dnl
-
 dnl ----------------------------------------------------------------
 dnl General "enable" options
 dnl set default to traditional to enable the original debug style
@@ -541,21 +523,6 @@ fi
 AC_MSG_RESULT(done)
 
 dnl ----------------------------------------------------------------
-
-dnl set moduledir- if moduledir starts with a /, then leave it alone.
-dnl otherwise, prepend libexecdir to it.
-case $moduledir in
-	/*|\\*)
-		;;
-	*)
-		moduledir=$libexecdir/$moduledir
-		;;
-esac
-
-AC_SUBST(moduledir)
-
-dnl ----------------------------------------------------------------
-
 dnl Initialize vars
 LDAP_LIBS=
 SLAPD_NDB_LIBS=