diff --git a/build.gradle b/build.gradle
index 6748378..cd6a239 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ tasks.withType(Test) {
 
 dependencies {
     compile 'io.rudefox:vixen:0.0.2'
-    compile 'info.picocli:picocli:4.0.4'
+    compile 'info.picocli:picocli:4.5.1'
     compile 'com.google.zxing:core:3.4.0'
     testCompile 'com.bjdweck.test:commons-test:0.0.1'
     testCompile "org.junit.jupiter:junit-jupiter-params:$junitVersion"
diff --git a/src/main/java/io/rudefox/burrow/RudefoxBurrow.java b/src/main/java/io/rudefox/burrow/RudefoxBurrow.java
index f3e286d..952525e 100644
--- a/src/main/java/io/rudefox/burrow/RudefoxBurrow.java
+++ b/src/main/java/io/rudefox/burrow/RudefoxBurrow.java
@@ -2,13 +2,14 @@ package io.rudefox.burrow;
 
 import com.bjdweck.bitcoin.params.INetworkParameters;
 import com.bjdweck.bitcoin.params.NetworkParameters;
+import picocli.AutoComplete;
 import picocli.CommandLine;
 
 @CommandLine.Command(
         name = "burrow",
         synopsisSubcommandLabel = "COMMAND",
         description = "Offline wallet tool",
-        subcommands = {MnemonicCommand.class, WalletCommand.class}
+        subcommands = {MnemonicCommand.class, WalletCommand.class, AutoComplete.GenerateCompletion.class}
 )
 public class RudefoxBurrow implements Runnable {