diff --git a/include/builddefs.in b/include/builddefs.in

index d054a56..10b0cd4 100644

--- a/include/builddefs.in

+++ b/include/builddefs.in

@@ -28,14 +28,14 @@ PKG_RELEASE	= @pkg_release@

 PKG_VERSION	= @pkg_version@

 PKG_PLATFORM	= @pkg_platform@

 PKG_DISTRIBUTION= @pkg_distribution@

-PKG_BIN_DIR	= @bindir@

-PKG_SBIN_DIR	= @sbindir@

-PKG_LIB_DIR	= @libdir@@libdirsuffix@

-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@

-PKG_INC_DIR	= @includedir@

-PKG_MAN_DIR	= @mandir@

-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@

-PKG_LOCALE_DIR	= @datadir@/locale

+PKG_BIN_DIR	= $(DESTDIR)@bindir@

+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@

+PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@

+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@

+PKG_INC_DIR	= $(DESTDIR)@includedir@

+PKG_MAN_DIR	= $(DESTDIR)@mandir@

+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@

+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale

 CC		= @cc@

 AWK		= @awk@

diff --git a/include/buildmacros b/include/buildmacros

index 17423c0..3118a17 100644

--- a/include/buildmacros

+++ b/include/buildmacros

@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \

 	  $(LFILES:.l=.o) \

 	  $(YFILES:%.y=%.tab.o)

-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)

+INSTALL	= $(TOPDIR)/include/install-sh

 SHELL = /bin/sh

 IMAGES_DIR = $(TOPDIR)/all-images