diff --git a/Makefile.am b/Makefile.am
index 6d0c2651a..b654439a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,6 +148,14 @@ rpm.pc: $(top_srcdir)/rpm.pc.in
 CLEANFILES += rpm.pc.tmp rpm.pc
 EXTRA_DIST += rpm.pc.in
 
+rpmpopt-@VERSION@: $(top_srcdir)/rpmpopt.in
+	@sed \
+	  -e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \
+	  < $(top_srcdir)/rpmpopt.in > rpmpopt-@VERSION@.tmp \
+	  && ( cd $(top_builddir) && ./config.status --file=${subdir}/rpmpopt-@VERSION@:${subdir}/rpmpopt-@VERSION@.tmp )
+CLEANFILES += rpmpopt-@VERSION@.tmp rpmpopt-@VERSION@
+EXTRA_DIST += rpmpopt.in
+
 pkgsrcdir = $(prefix)/src/$(RPMCANONVENDOR)
 pkgsrc_RPMSdir = $(pkgsrcdir)/RPMS
 pkgsrc_RPMS_DATA =
diff --git a/configure.ac b/configure.ac
index a617b01d0..8562ae87d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1076,5 +1076,4 @@ AC_CONFIG_FILES([ Doxyfile Makefile
  	lua/Makefile
  	tests/Makefile
   ])
-AC_CONFIG_FILES([rpmpopt-${VERSION}:rpmpopt.in],,[VERSION=${VERSION}])
 AC_OUTPUT