diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4fb57803..d0a3eb51 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -76,7 +76,7 @@ REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
 endif
 
 man_MANS =
-dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8
+dist_man_MANS = $(ASCIIDOC_MANS)
 
 if USE_DOXYGEN
 man_MANS += $(DOXYGEN_MANS)
@@ -151,4 +151,13 @@ repo-remove.8: repo-add.8
 	rm -f repo-remove.8
 	$(LN_S) repo-add.8 repo-remove.8
 
+install-data-hook:
+	cd $(DESTDIR)$(mandir)/man8 && \
+		( $(LN_S) repo-add.8 repo-remove.8 || \
+		ln repo-add.8 repo-remove.8 || \
+		cp repo-add.8 repo-remove.8 )
+
+uninstall-hook:
+	$(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8
+
 # vim:set ts=2 sw=2 noet:
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index adb259a7..b5767ac6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -4,9 +4,7 @@ AUTOMAKE_OPTIONS = std-options
 SUBDIRS = po
 
 bin_SCRIPTS = \
-	$(OURSCRIPTS) \
-	repo-remove \
-	repo-elephant
+	$(OURSCRIPTS)
 
 OURSCRIPTS = \
 	makepkg \
@@ -105,4 +103,18 @@ repo-elephant: $(srcdir)/repo-add.sh.in
 	rm -f repo-elephant
 	$(LN_S) repo-add repo-elephant
 
+install-data-hook:
+	cd $(DESTDIR)$(bindir) && \
+		( $(LN_S) repo-add repo-elephant || \
+		ln repo-add repo-elephant || \
+		cp repo-add repo-elephant )
+	cd $(DESTDIR)$(bindir) && \
+		( $(LN_S) repo-add repo-remove || \
+		ln repo-add repo-remove || \
+		cp repo-add repo-remove )
+
+uninstall-hook:
+	cd $(DESTDIR)$(bindir) && \
+		$(RM) repo-remove repo-elephant
+
 # vim:set ts=2 sw=2 noet: