diff --git a/completions/Makefile.am b/completions/Makefile.am
index 7666ade4..ec06a9e7 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -283,6 +283,7 @@ bashcomp_DATA = 2to3 \
 		pwdx \
 		pwgen \
 		pydoc \
+		pyflakes \
 		pylint \
 		python \
 		qdbus \
diff --git a/completions/pyflakes b/completions/pyflakes
new file mode 100644
index 00000000..f374252b
--- /dev/null
+++ b/completions/pyflakes
@@ -0,0 +1,23 @@
+# pyflakes(1) completion                                   -*- shell-script -*-
+
+_pyflakes()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    case $prev in
+        -h|--help|--version)
+            return
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
+        return
+    fi
+
+    _filedir py
+} &&
+complete -F _pyflakes pyflakes
+
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/test/completion/pyflakes.exp b/test/completion/pyflakes.exp
new file mode 100644
index 00000000..b10445f6
--- /dev/null
+++ b/test/completion/pyflakes.exp
@@ -0,0 +1 @@
+assert_source_completions pyflakes
diff --git a/test/lib/completions/pyflakes.exp b/test/lib/completions/pyflakes.exp
new file mode 100644
index 00000000..22a8cf7c
--- /dev/null
+++ b/test/lib/completions/pyflakes.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pyflakes "
+sync_after_int
+
+
+teardown