diff --git a/setup.py b/setup.py
index d69918f..8562174 100755
--- a/setup.py
+++ b/setup.py
@@ -4,11 +4,12 @@
 import platform
 import sys
 import sysconfig
-from subprocess import check_call
+import argcomplete
 from build_manpages import build_manpages, get_build_py_cmd, get_install_cmd
 from setuptools import setup
 from setuptools.command.build_py import build_py
 from setuptools.command.egg_info import egg_info
+from subprocess import check_call
 from virtme_ng.version import get_version_string
 
 os.environ["__VNG_LOCAL"] = "1"
@@ -57,6 +58,12 @@ def run(self):
                 cwd=cwd,
             )
 
+        # Generate bash autocompletion scripts
+        with open("virtme-ng-prompt", "w") as f:
+            f.write(argcomplete.shellcode(["virtme-ng"]))
+        with open("vng-prompt", "w") as f:
+            f.write(argcomplete.shellcode(["vng"]))
+
         # Run the rest of virtme-ng build
         build_py.run(self)
 
@@ -97,7 +104,8 @@ def run(self):
     packages.append("virtme.guest.bin")
 
 data_files = [
-    ("/etc", ["cfg/virtme-ng.conf"]),
+    ("etc", ["cfg/virtme-ng.conf"]),
+    ("share/bash-completion/completions", ["virtme-ng-prompt", "vng-prompt"]),
 ]
 
 setup(
@@ -137,6 +145,7 @@ def run(self):
     },
     packages=packages,
     package_data={"virtme.guest": package_files},
+    data_files=data_files,
     scripts=[
         "bin/virtme-prep-kdir-mods",
     ],