diff --git a/build-aux/m4/buildsys.m4 b/build-aux/m4/buildsys.m4
index 4b96aea..ed9d8cf 100644
--- a/build-aux/m4/buildsys.m4
+++ b/build-aux/m4/buildsys.m4
@@ -36,6 +36,13 @@ AC_DEFUN([BUILDSYS_INIT], [
 		;;
 	esac
 
+	AC_PROG_INSTALL
+	case "$INSTALL" in
+	./build-aux/install-sh*)
+		INSTALL="$PWD/$INSTALL"
+		;;
+	esac
+
 	AC_CONFIG_COMMANDS_PRE([
 		AS_IF([test x"$GCC" = x"yes"],
 			[AC_SUBST(DEP_CFLAGS, '-MD -MF $${out%.o}.dep')])
diff --git a/configure.ac b/configure.ac
index 8b38f50..2326b8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,6 @@ BUILDSYS_INIT
 dnl If your package uses C, you want a C compiler and a C preprocessor
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_INSTALL
 
 dnl The buildsys might require ln -s to install libraries.
 dnl Uncomment if you are compiling a library.