diff --git a/Makefile.am b/Makefile.am
index 89a9518..01a88a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ SUBDIRS = lzma man doc
 
 AM_CFLAGS = -I lzma/C -DNDEBUG
 
-lrztardir = @bindir@
+lrztardir = $(bindir)
 lrztar_SCRIPTS = lrztar
 
 bin_PROGRAMS = lrzip
@@ -72,19 +72,19 @@ EXTRA_DIST = \
 		description-pak \
 		autogen.sh \
 		INSTALL \
-		lrzip.completion \
+		bash_completion.d/lrzip \
 		$(dist_doc_DATA)
 
-install-data-hook:
-	test -d /etc/bash_completion.d && @INSTALL_DATA@ lrzip.completion /etc/bash_completion.d/lrzip
+completiondir = $(DESTDIR)/$(sysconfdir)/bash_completion.d
+completion_DATA = @top_srcdir@/bash_completion.d/lrzip
 
 install-exec-hook:
-	$(LN_S) -f lrzip$(EXEEXT) $(DESTDIR)@bindir@/lrunzip$(EXEEXT)
-	$(LN_S) -f lrzip$(EXEEXT) $(DESTDIR)@bindir@/lrzcat$(EXEEXT)
-	$(LN_S) -f lrztar$(EXEEXT) $(DESTDIR)@bindir@/lrzuntar$(EXEEXT)
+	$(LN_S) -f lrzip$(EXEEXT) $(DESTDIR)$(bindir)/lrunzip$(EXEEXT)
+	$(LN_S) -f lrzip$(EXEEXT) $(DESTDIR)$(bindir)/lrzcat$(EXEEXT)
+	$(LN_S) -f lrztar$(EXEEXT) $(DESTDIR)$(bindir)/lrzuntar$(EXEEXT)
 
 
 uninstall-local:
-	rm -f @bindir@/lrunzip
-	rm -f @bindir@/lrzcat
-	rm -f @bindir@/lrzuntar
+	rm -f $(bindir)/lrunzip
+	rm -f $(bindir)/lrzcat
+	rm -f $(bindir)/lrzuntar
diff --git a/lrzip.completion b/bash_completion.d/lrzip
similarity index 100%
rename from lrzip.completion
rename to bash_completion.d/lrzip