diff --git a/Makefile-lib.am b/Makefile-lib.am
index 38ea6102..9559e0b9 100644
--- a/Makefile-lib.am
+++ b/Makefile-lib.am
@@ -36,7 +36,9 @@ librpmostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libp
 librpmostree_1_la_LDFLAGS = $(AM_LDFLAGS) -version-number 1:0:0 -Bsymbolic-functions
 librpmostree_1_la_LIBADD =  $(PKGDEP_RPMOSTREE_LIBS) librpmostreepriv.la $(librpmostree_rust_path)
 
-# bundled libdnf
+# The g-ir-scanner creates a stub executable (to help introspect type information) which
+# links to our stuff. We want to make sure it picks up our fresh libdnf and not a possibly
+# stale one from a previously installed rpm-ostree's bundled libdnf.
 INTROSPECTION_SCANNER_ENV = env LD_LIBRARY_PATH=$(top_builddir)/libdnf-build/libdnf
 
 # XXX: work around clang being passed -fstack-clash-protection which it doesn't understand
diff --git a/Makefile.am b/Makefile.am
index 817fe24d..cbc48ecb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,8 +44,9 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' \
 # Keep this in sync with the AM_CFLAGS in libostree; see
 # that project for more information about e.g. -fno-strict-aliasing
 AM_CFLAGS += -std=gnu11 -fno-strict-aliasing $(WARN_CFLAGS)
-# bundled libdnf
-AM_LDFLAGS += "-Wl,-rpath=$(libdir)/rpm-ostree"
+# bundled libdnf; --enable-new-dtags emits DT_RUNPATH instead of deprecated DT_RPATH, which
+# can't be overridden by LD_LIBRARY_PATH; which is useful for uninstalled runs/tests
+AM_LDFLAGS += "-Wl,-rpath=$(libdir)/rpm-ostree,--enable-new-dtags"
 
 EXTRA_DIST += autogen.sh COPYING