diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..4e4f2e0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ykoath"]
+	path = ykoath
+	url = https://github.com/vividboarder/ykoath
diff --git a/Makefile b/Makefile
index bcbc6c5..dbc891e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION ?= $(shell git describe --tags --dirty)
 NAME := yk
-GOFILES = *.go
+GOFILES = *.go go.mod go.sum
 # Multi-arch targets are generated from this
 TARGET_ALIAS = $(NAME)-linux-amd64 $(NAME)-linux-arm $(NAME)-linux-arm64 $(NAME)-darwin-amd64
 TARGETS = $(addprefix dist/,$(TARGET_ALIAS))
diff --git a/go.mod b/go.mod
index e89bf7f..e725001 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module git.iamthefij.com/iamthefij/yk-cli
 
 go 1.15
 
-replace github.com/yawn/ykoath => ../ykoath
+replace github.com/yawn/ykoath => ./ykoath
 
 require (
 	git.iamthefij.com/iamthefij/slog v1.2.0
diff --git a/scripts/yk.fish b/scripts/yk.fish
index d2017aa..ae39e15 100644
--- a/scripts/yk.fish
+++ b/scripts/yk.fish
@@ -3,7 +3,7 @@ complete -c yk -f
 # Add completion for setting password
 complete -c yk -a set-password -d "Set authentication password"
 # Add completion of credentials
-complete -c yk -a "(yk list)" -d "Credential to get totp for"
+complete -c yk -a "(yk list)" -d "Credential to get TOTP for"
 
 function yk-copy --description "Select a credential using fzf and copy it to clipboard"
     yk (yk list | fzf) | pbcopy
diff --git a/ykoath b/ykoath
new file mode 160000
index 0000000..b083034
--- /dev/null
+++ b/ykoath
@@ -0,0 +1 @@
+Subproject commit b083034539df4a37cb676af7afd7abd3d9f3ec4f