diff --git a/Makefile b/Makefile
index b216b1b..33093a7 100644
--- a/Makefile
+++ b/Makefile
@@ -285,6 +285,9 @@ container-run:
 PHONY+=${FLUCKY_REMOTE:%=remote/%}
 remote/${FLUCKY_REMOTE}: bin/linux/arm/7/${EXECUTABLE}
 	scp bin/linux/arm/7/${EXECUTABLE} root@${FLUCKY_REMOTE}:/usr/local/bin/${EXECUTABLE}
+	ssh root@${FLUCKY_REMOTE} 'mkdir --parent /etc/bash_completion.d || true'
+	ssh root@${FLUCKY_REMOTE} 'flucky completion bash > /etc/bash_completion.d/flucky.sh && chmod +x /etc/bash_completion.d/flucky.sh'
+	ssh root@${FLUCKY_REMOTE} 'flucky completion zsh > /etc/bash_completion.d/flucky.zsh && chmod +x /etc/bash_completion.d/flucky.zsh'
 	ssh root@${FLUCKY_REMOTE} 'chmod +x /usr/local/bin/${EXECUTABLE}'
 
 # PHONY