diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09b3de8..da6f3c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -271,11 +271,17 @@ package-aur:
     - echo "Determining SHA checksums for remote files..."
     - URL_BIN=https://github.com/timvisee/ffsend/releases/download/v$VERSION/ffsend-v$VERSION-linux-x64-static
     - URL_SOURCE=https://gitlab.com/timvisee/ffsend/-/archive/v$VERSION/ffsend-v$VERSION.tar.gz
+    - URL_BASH_COMPLETION=https://gitlab.com/timvisee/ffsend/raw/v$VERSION/contrib/completions/ffsend.bash
+    - URL_FISH_COMPLETION=https://gitlab.com/timvisee/ffsend/raw/v$VERSION/contrib/completions/ffsend.fish
     - 'echo "Selected binary URL: $URL_BIN"'
     - 'echo "Selected source URL: $URL_SOURCE"'
     - echo "Determining sha256sum for remote binary..."
     - 'SHA_BIN=$(curl -sSL "$URL_BIN" | sha256sum | cut -d" " -f1)'
     - 'echo "Got sha256sum: $SHA_BIN"'
+    - 'SHA_BASH_COMPLETION=$(curl -sSL "$URL_BASH_COMPLETION" | sha256sum | cut -d" " -f1)'
+    - 'echo "Got sha256sums of bash completion: $SHA_BASH_COMPLETION"'
+    - 'SHA_FISH_COMPLETION=$(curl -sSL "$URL_FISH_COMPLETION" | sha256sum | cut -d" " -f1)'
+    - 'echo "Got sha256sums of fish completion: $SHA_FISH_COMPLETION"'
     - echo "Determining sha256sum for remote source..."
     - 'SHA_SOURCE=$(curl -sSL "$URL_SOURCE" | sha256sum | cut -d" " -f1)'
     - 'echo "Got sha256sum: $SHA_SOURCE"'
@@ -286,9 +292,11 @@ package-aur:
     - sed "s/^pkgver=.*\$/pkgver=$VERSION/" -i ffsend-bin/PKGBUILD
     - sed "s/^pkgver=.*\$/pkgver=$VERSION.$CI_COMMIT_SHORT_SHA/" -i ffsend-git/PKGBUILD
     - sed "s/^source=(\"\(.*\)::.*\").*\$/source=(\"\1::$(echo $URL_SOURCE | sed 's/\//\\\//g')\")/" -i ffsend/PKGBUILD
-    - sed "s/^source=(\"\(.*\)::.*\").*\$/source=(\"\1::$(echo $URL_BIN | sed 's/\//\\\//g')\")/" -i ffsend-bin/PKGBUILD
+    - sed "s/\(\"ffsend-v\$pkgver::\).*\"/\1$URL_BIN\"/" -i ffsend-bin/PKGBUILD
+    - sed "s/\(\"ffsend-v\$pkgver.bash::\).*\"/\1$URL_BASH_COMPLETION\"/" -i ffsend-bin/PKGBUILD
+    - sed "s/\(\"ffsend-v\$pkgver.fish::\).*\"/\1$URL_FISH_COMPLETION\"/" -i ffsend-bin/PKGBUILD
     - sed "s/^sha256sums=.*\$/sha256sums=('$SHA_SOURCE')/" -i ffsend/PKGBUILD
-    - sed "s/^sha256sums=.*\$/sha256sums=('$SHA_BIN')/" -i ffsend-bin/PKGBUILD
+    - sed "s/^sha256sums=.*\$/sha256sums=('$SHA_BIN' '$SHA_BASH_COMPLETION' '$SHA_FISH_COMPLETION')/" -i ffsend-bin/PKGBUILD
 
     # Get SHA hash for local and remote file w/o version, update if it has changed
     - 'SHA_STRIP_LOCAL=$(cat ffsend-git/PKGBUILD | sed /^pkgver=.\*/d | sha256sum | cut -d" " -f1)'
diff --git a/pkg/aur/ffsend-bin/PKGBUILD b/pkg/aur/ffsend-bin/PKGBUILD
index 0583d5b..a7750ea 100644
--- a/pkg/aur/ffsend-bin/PKGBUILD
+++ b/pkg/aur/ffsend-bin/PKGBUILD
@@ -11,14 +11,24 @@ pkgrel=1
 pkgdesc="Easily and securely share files from the command line. A Firefox Send client."
 url="https://gitlab.com/timvisee/ffsend"
 license=('GPL3')
-source=("ffsend-v${pkgver}::https://github.com/timvisee/ffsend/releases/download/v$pkgver/ffsend-v$pkgver-linux-x64-static") # automatically set in CI, see: /.gitlab-ci.yml
-sha256sums=('SKIP') # automatically set in CI, see: /.gitlab-ci.yml
+source=("ffsend-v$pkgver::https://github.com/timvisee/ffsend/releases/download/v$pkgver/ffsend-v$pkgver-linux-x64-static"
+        "ffsend-v$pkgver.bash::https://raw.githubusercontent.com/timvisee/ffsend/v$pkgver/contrib/completions/ffsend.bash"
+        "ffsend-v$pkgver.fish::https://raw.githubusercontent.com/timvisee/ffsend/v$pkgver/contrib/completions/ffsend.fish") # automatically set in CI, see: /.gitlab-ci.yml
+sha256sums=('SKIP')
 arch=('x86_64')
 provides=('ffsend')
 conflicts=('ffsend')
 depends=('ca-certificates')
-optdepends=('xclip: clipboard support')
+optdepends=('xclip: clipboard support'
+            'bash-completion: support auto completion for bash')
 
 package() {
-    install -Dm755 "$srcdir/ffsend-v${pkgver}" "$pkgdir/usr/bin/ffsend"
+    cd "$srcdir"
+
+    # Install Binary
+    install -Dm755 "ffsend-v$pkgver" "$pkgdir/usr/bin/ffsend"
+
+    # Install completions
+    install -Dm644 "ffsend-v$pkgver.bash" "$pkgver/usr/share/bash-completion/completions/ffsend"
+    install -Dm644 "ffsend-v$pkgver.fish" "$pkgver/usr/share/fish/vendor_completions.d/ffsend.fish"
 }
diff --git a/pkg/aur/ffsend-git/PKGBUILD b/pkg/aur/ffsend-git/PKGBUILD
index 8fcdcc1..5a6d3e2 100644
--- a/pkg/aur/ffsend-git/PKGBUILD
+++ b/pkg/aur/ffsend-git/PKGBUILD
@@ -17,7 +17,8 @@ provides=('ffsend')
 conflicts=('ffsend')
 depends=('ca-certificates')
 makedepends=('openssl>=1.0' 'rust>=1.32' 'cargo' 'cmake')
-optdepends=('xclip: clipboard support')
+optdepends=('xclip: clipboard support'
+            'bash-completion: support auto completion for bash')
 
 build() {
     cd ffsend
@@ -25,5 +26,13 @@ build() {
 }
 
 package() {
-    install -Dm755 "$srcdir/ffsend/target/release/ffsend" "$pkgdir/usr/bin/ffsend"
+    cd "$srcdir/ffsend"
+
+    # Install Binary
+    install -Dm755 "./target/release/ffsend" "$pkgdir/usr/bin/ffsend"
+
+    # Install completions
+    cd "./contrib/completions"
+    install -Dm644 "ffsend.bash" "$pkgver/usr/share/bash-completion/completions/ffsend"
+    install -Dm644 "ffsend.fish" "$pkgver/usr/share/fish/vendor_completions.d/ffsend.fish"
 }
diff --git a/pkg/aur/ffsend/PKGBUILD b/pkg/aur/ffsend/PKGBUILD
index 7dad64f..409d7a7 100644
--- a/pkg/aur/ffsend/PKGBUILD
+++ b/pkg/aur/ffsend/PKGBUILD
@@ -16,7 +16,8 @@ arch=('x86_64' 'i686')
 provides=('ffsend')
 depends=('ca-certificates')
 makedepends=('openssl>=1.0' 'rust>=1.32' 'cargo' 'cmake')
-optdepends=('xclip: clipboard support')
+optdepends=('xclip: clipboard support'
+            'bash-completion: support auto completion for bash')
 
 build() {
     cd "ffsend-v$pkgver"
@@ -24,5 +25,13 @@ build() {
 }
 
 package() {
-    install -Dm755 "$srcdir/ffsend-v$pkgver/target/release/ffsend" "$pkgdir/usr/bin/ffsend"
+    cd "$srcdir/ffsend-v$pkgver"
+
+    # Install Binary
+    install -Dm755 "./target/release/ffsend" "$pkgdir/usr/bin/ffsend"
+
+    # Install completions
+    cd "./contrib/completions"
+    install -Dm644 "ffsend.bash" "$pkgver/usr/share/bash-completion/completions/ffsend"
+    install -Dm644 "ffsend.fish" "$pkgver/usr/share/fish/vendor_completions.d/ffsend.fish"
 }