diff --git a/conf/bash-completion.d/Makefile b/conf/bash-completion.d/Makefile
new file mode 100644
index 00000000..a4772e58
--- /dev/null
+++ b/conf/bash-completion.d/Makefile
@@ -0,0 +1,8 @@
+TOPDIR = ../..
+
+INSTALL_CFGDIR = $(ENV_PREFIX)/usr/share/bash-completion/completions
+LOCAL_CFG = $(filter-out Makefile,$(wildcard *))
+PACKAGE_INSTALL_DIR = false
+
+include $(TOPDIR)/make/proj.mk
+include $(JWBDIR)/make/conf.mk
diff --git a/conf/bash-completion.d/jw-pkg.py b/conf/bash-completion.d/jw-pkg.py
new file mode 100644
index 00000000..d7f5af7f
--- /dev/null
+++ b/conf/bash-completion.d/jw-pkg.py
@@ -0,0 +1 @@
+eval "$(register-python-argcomplete /opt/jw-pkg/bin/jw-pkg.py jw-pkg.py)"
diff --git a/scripts/jw-pkg.py b/scripts/jw-pkg.py
index db2e84ac..3c78f0d8 100644
--- a/scripts/jw-pkg.py
+++ b/scripts/jw-pkg.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
+# PYTHON_ARGCOMPLETE_OK
 
 from jw.pkg.App import App