diff --git a/completions/Makefile.am b/completions/Makefile.am
index be5bc26d..7b8f7679 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -261,6 +261,7 @@ bashcomp_DATA = 2to3 \
 		pm-is-supported \
 		pm-powersave \
 		portinstall \
+		portsnap \
 		portupgrade \
 		postcat \
 		postconf \
diff --git a/completions/portsnap b/completions/portsnap
new file mode 100644
index 00000000..22937c02
--- /dev/null
+++ b/completions/portsnap
@@ -0,0 +1,25 @@
+# bash completion for Portsnap                             -*- shell-script -*-
+
+[[ $OSTYPE == *freebsd* ]] || return 1
+
+_portsnap()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -d|-p)
+            _filedir -d
+            return
+            ;;
+        -l|-f)
+            _filedir
+            return
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W "fetch cron extract update" -- $cur) )
+} &&
+complete -F _portsnap  portsnap
+
+# ex: ts=4 sw=4 et filetype=sh