diff --git a/conf/bash-completion.d/jw-pkg b/conf/bash-completion.d/jw-pkg
new file mode 100644
index 00000000..04de06af
--- /dev/null
+++ b/conf/bash-completion.d/jw-pkg
@@ -0,0 +1 @@
+eval "$(register-python-argcomplete jw-pkg jw-pkg.py /usr/bin/jw-pkg /opt/jw-pkg/bin/jw-pkg.py)"
diff --git a/conf/bash-completion.d/jw-pkg.py b/conf/bash-completion.d/jw-pkg.py
deleted file mode 100644
index d7f5af7f..00000000
--- a/conf/bash-completion.d/jw-pkg.py
+++ /dev/null
@@ -1 +0,0 @@
-eval "$(register-python-argcomplete /opt/jw-pkg/bin/jw-pkg.py jw-pkg.py)"
diff --git a/scripts/Makefile b/scripts/Makefile
index 44e2f969..33ee2db7 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,5 +1,5 @@
 TOPDIR = ..
 
 include $(TOPDIR)/make/proj.mk
-EXE_SH += $(wildcard jannet jcs)
 include $(JWBDIR)/make/scripts.mk
+include $(JWBDIR)/make/dirs.mk
diff --git a/scripts/usr-bin/Makefile b/scripts/usr-bin/Makefile
new file mode 100644
index 00000000..6465ef5b
--- /dev/null
+++ b/scripts/usr-bin/Makefile
@@ -0,0 +1,7 @@
+TOPDIR = ../..
+
+EXE_PREFIX = $(ENV_PREFIX)/usr
+EXE_SH = jw-pkg
+
+include $(TOPDIR)/make/proj.mk
+include $(JWBDIR)/make/scripts.mk
diff --git a/scripts/usr-bin/jw-pkg b/scripts/usr-bin/jw-pkg
new file mode 120000
index 00000000..81998799
--- /dev/null
+++ b/scripts/usr-bin/jw-pkg
@@ -0,0 +1 @@
+/opt/jw-pkg/bin/jw-pkg.py
\ No newline at end of file