diff --git a/Makefile.in b/Makefile.in
index 5216fb2f7..7896f5dae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,6 +21,7 @@ LIBOBJDIR=lib/
 
 INSTALLCMD=@INSTALL@
 INSTALLMAN=@INSTALL@
+STRIP=@STRIP@
 
 srcdir=@srcdir@
 MKDIR_P=@MKDIR_P@
@@ -109,7 +110,8 @@ install-ssl-daemon: stunnel-rsyncd.conf
 install-all: install install-ssl-daemon
 
 install-strip:
-	$(MAKE) INSTALL_STRIP='-s' install
+	$(MAKE) install
+	$(STRIP) $(DESTDIR)$(bindir)/rsync$(EXEEXT)
 
 .PHONY: uninstall
 uninstall:
diff --git a/configure.ac b/configure.ac
index cda60405b..b16734a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ AC_PROG_CXX
 AC_PROG_AWK
 AC_PROG_EGREP
 AC_PROG_INSTALL
+AC_CHECK_TOOL([STRIP], [strip], [strip])
 AC_PROG_MKDIR_P
 AC_SUBST(SHELL)
 AC_PATH_PROG([PERL], [perl])