diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 232e6d7c08..4420501d48 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -74,8 +74,15 @@ parts:
       $SNAPCRAFT_STAGE/scriptlets/selective-checkout
 
     plugin: python
+    build-packages:
+    - make
     python-packages:
     - youtube_dl
+    override-build: |
+      # build manpages and bash completion
+      make
+
+      snapcraftctl build
 
   ffmpeg:
     plugin: nil
@@ -99,6 +106,7 @@ apps:
     command-chain:
     - bin/gallery-dl-launch
     command: bin/gallery-dl
+    completer: etc/bash_completion.d/gallery-dl.bash_completion
     environment:
       LANG: C.UTF-8
       LC_ALL: C.UTF-8