diff --git a/completions/checkcert-complete.sh b/completions/checkcert-complete.sh
new file mode 100644
index 0000000..362a38b
--- /dev/null
+++ b/completions/checkcert-complete.sh
@@ -0,0 +1,29 @@
+_checkcert_completion() {
+    local IFS=$'\n'
+    local response
+
+    response=$(env COMP_WORDS="${COMP_WORDS[*]}" COMP_CWORD=$COMP_CWORD _CHECKCERT_COMPLETE=bash_complete $1)
+
+    for completion in $response; do
+        IFS=',' read type value <<< "$completion"
+
+        if [[ $type == 'dir' ]]; then
+            COMREPLY=()
+            compopt -o dirnames
+        elif [[ $type == 'file' ]]; then
+            COMREPLY=()
+            compopt -o default
+        elif [[ $type == 'plain' ]]; then
+            COMPREPLY+=($value)
+        fi
+    done
+
+    return 0
+}
+
+_checkcert_completion_setup() {
+    complete -o nosort -F _checkcert_completion checkcert
+}
+
+_checkcert_completion_setup;
+
diff --git a/completions/checkcert-complete.zsh b/completions/checkcert-complete.zsh
new file mode 100644
index 0000000..b0611e5
--- /dev/null
+++ b/completions/checkcert-complete.zsh
@@ -0,0 +1,35 @@
+#compdef checkcert
+
+_checkcert_completion() {
+    local -a completions
+    local -a completions_with_descriptions
+    local -a response
+    (( ! $+commands[checkcert] )) && return 1
+
+    response=("${(@f)$(env COMP_WORDS="${words[*]}" COMP_CWORD=$((CURRENT-1)) _CHECKCERT_COMPLETE=zsh_complete checkcert)}")
+
+    for type key descr in ${response}; do
+        if [[ "$type" == "plain" ]]; then
+            if [[ "$descr" == "_" ]]; then
+                completions+=("$key")
+            else
+                completions_with_descriptions+=("$key":"$descr")
+            fi
+        elif [[ "$type" == "dir" ]]; then
+            _path_files -/
+        elif [[ "$type" == "file" ]]; then
+            _path_files -f
+        fi
+    done
+
+    if [ -n "$completions_with_descriptions" ]; then
+        _describe -V unsorted completions_with_descriptions -U
+    fi
+
+    if [ -n "$completions" ]; then
+        compadd -U -V unsorted -a completions
+    fi
+}
+
+compdef _checkcert_completion checkcert;
+