diff --git a/Makefile b/Makefile
index c6c60d84..a8718df9 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,7 @@ pure_install:
 	install -d $(DEST_RAY)/$(_DIR)/
 	install -d $(DEST_RAY)/$(PATCHBAY_DIR)/locale/
 	install -d $(DESTDIR)/etc/xdg/raysession/client_templates/
-	install -d $(DESTDIR)/etc/bash_completion.d
+	install -d $(DESTDIR)$(PREFIX)/share/bash-completion/completions/
 	
 	# Install icons
 	for sz in $(ICON_SIZES);do \
@@ -168,9 +168,9 @@ pure_install:
 	cp -r data              $(DEST_RAY)/
 
 	# Copy completion script
-	cp -r src/completion/ray_completion.sh $(DESTDIR)/etc/bash_completion.d/
+	cp -r src/completion/ray_completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/raysession
 	sed -i "s|XXX_PYCOMPLETION_XXX|$(DEST_RAY)/src/completion|" \
-		$(DESTDIR)/etc/bash_completion.d/ray_completion.sh
+		$(DESTDIR)$(PREFIX)/share/bash-completion/completions/raysession
 
 	# Copy patchbay themes, manual and lib
 	cp -r HoustonPatchbay/themes $(DEST_RAY)/$(PATCHBAY_DIR)/
@@ -209,7 +209,7 @@ pure_install:
 	install -m 755 data/bin/ray_control $(DESTDIR)$(PREFIX)/bin/
 	
 	# Install Translations
-	install -m 644 locale/*.qm $(DEST_RAY)/locale/
-	install -m 644 $(PATCHBAY_DIR)/locale/*.qm $(DEST_RAY)/$(PATCHBAY_DIR)/locale
+	install -m 644 -t $(DEST_RAY)/locale/ locale/*.qm
+	install -m 644 -t $(DEST_RAY)/$(PATCHBAY_DIR)/locale/ $(PATCHBAY_DIR)/locale/*.qm
 
 
diff --git a/src/completion/ray_completion.sh b/src/completion/ray_completion.sh
index 354725b3..dda07c92 100755
--- a/src/completion/ray_completion.sh
+++ b/src/completion/ray_completion.sh
@@ -1,11 +1,8 @@
-#!/usr/bin/env bash
-
-PY_FILE=XXX_PYCOMPLETION_XXX
-
-ray_complete() {
+_ray_complete() {
+    PY_FILE=XXX_PYCOMPLETION_XXX
     IFS=$'\n'
     COMPREPLY=($(compgen -W "$(python3 "$PY_FILE" "${COMP_WORDS[@]}")" -- "${COMP_WORDS[COMP_CWORD]}"))
     unset IFS
 }
 
-complete -F ray_complete ray_control
+complete -F _ray_complete ray_control