--- a/configure.ac
+++ b/configure.ac
@@ -865,13 +865,7 @@ AC_ARG_WITH([rundir],
 AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
 AC_SUBST(RUNDIR)
 
-if test X"$prefix" = XNONE ; then
-    usrprefix="$ac_default_prefix"
-else
-    usrprefix=$prefix
-fi
-
-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
 AC_SUBST(RPMCONFIGDIR)
 
 AC_SUBST(OBJDUMP)
--- a/rpm.am
+++ b/rpm.am
@@ -1,10 +1,10 @@
 # Internal binaries
 ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
-rpmlibexecdir = $(prefix)/lib/rpm
+rpmlibexecdir = $(pkglibexecdir)
 
 # Host independent config files
 ## HACK: it probably should be $(datadir)/rpm
-rpmconfigdir = $(prefix)/lib/rpm
+rpmconfigdir = $(pkglibexecdir)
 
 # Libtool version (current-revision-age) for all our libraries
 rpm_version_info = 11:0:2
