diff --git a/Makefile b/Makefile
index eea0e7a1..699d5cbf 100644
--- a/Makefile
+++ b/Makefile
@@ -133,7 +133,7 @@ clean_tests: clean
 	$(RM) -f .math.txt .results.txt .ops.txt
 	$(RM) -f .test.txt
 
-install:
+install: uninstall
 	$(INSTALL) $(DESTDIR)$(PREFIX)/bin $(BC_EXEC) $(DC_EXEC)
 
 uninstall:
diff --git a/install.sh b/install.sh
index 26ba970a..64d615ac 100755
--- a/install.sh
+++ b/install.sh
@@ -32,6 +32,11 @@ shift
 exe="$1"
 shift
 
+while [ ! -f "$exe" ]; do
+	exe="$1"
+	shift
+done
+
 "$INSTALL" -Dm 755 "$exe" "$installdir/$exe"
 
 while [ $# -gt 0 ]; do
diff --git a/safe-install.sh b/safe-install.sh
index 98f4b4e8..04108838 100755
--- a/safe-install.sh
+++ b/safe-install.sh
@@ -32,8 +32,6 @@ src=$1
 dst=$2
 tmp="$dst.tmp.$$"
 
-[ -f "$src" ] || exit 0
-
 case "$dst" in
 */) printf "%s: %s ends in /\n", "$0" "$dst" 1>&2 ; exit 1 ;;
 esac