diff --git a/build/Makefile.am b/build/Makefile.am
index 71a24be69..9bc29765d 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -19,7 +19,7 @@ librpmbuild_la_LIBADD = -L$(top_builddir)/lib/.libs -lrpm
 
 # XXX Drill out -L ldflags remnants until libtool-1.4 appears
 install-data-local:
-	@cd $(libdir) && \
+	@cd $(DESTDIR)/$(libdir) && \
 	sed -e "s|-L$(top_builddir)/lib/.libs ||" < librpmbuild.la > .librpmbuild.la && \
 	mv .librpmbuild.la librpmio.la
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ec97235be..21aaa343d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -34,7 +34,7 @@ librpm_la_LIBADD = $(subst .c,.lo,$(DBLIBOBJS))
 
 # XXX Drill out -L ldflags remnants until libtool-1.4 appears
 install-data-local:
-	@cd $(libdir) && \
+	@cd $(DESTDIR)/$(libdir) && \
 	sed -e "s|-L$(top_builddir)/rpmio/.libs ||" < librpm.la > .librpm.la && \
 	mv .librpm.la librpm.la
 
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index a31517f45..625ab3f1f 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -5,9 +5,9 @@
 
 /* and it shouldn't need these :-( */
 
-#include <rpmio.h>
-#include <header.h>
-#include <popt.h>
+#include "rpmio.h"
+#include "header.h"
+#include "popt.h"
 
 typedef /*@abstract@*/ struct _dbiIndexSet * dbiIndexSet;
 
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 202327c77..dc8ad4c0f 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -15,7 +15,7 @@ librpmio_la_LIBADD = @LIBMISC@
 
 # XXX Drill out -L ldflags remnants until libtool-1.4 appears
 install-data-local:
-	@cd $(libdir) && \
+	@cd $(DESTDIR)/$(libdir) && \
 	sed -e "s|-L$(top_builddir)/popt/.libs ||" < librpmio.la > .librpmio.la && \
 	mv .librpmio.la librpmio.la