diff --git a/packages/sys-apps/lsd/lsd-0.15.1.exheres-0 b/packages/sys-apps/lsd/lsd-0.15.1.exheres-0
new file mode 100644
index 0000000..a57e582
--- /dev/null
+++ b/packages/sys-apps/lsd/lsd-0.15.1.exheres-0
@@ -0,0 +1,9 @@
+# Copyright 2019 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require cargo [ channel=stable ]
+require github [ user=Peltoche tag="${PV}" ]
+require lsd
+
+PLATFORMS="~amd64 ~x86"
+
diff --git a/packages/sys-apps/lsd/lsd-scm.exheres-0 b/packages/sys-apps/lsd/lsd-scm.exheres-0
index d3aadb8..f49000d 100644
--- a/packages/sys-apps/lsd/lsd-scm.exheres-0
+++ b/packages/sys-apps/lsd/lsd-scm.exheres-0
@@ -3,17 +3,7 @@
 
 require github [ user=Peltoche tag="${PV}" ]
 require cargo [ channel=stable ]
+require lsd
 
-SUMMARY="The next gen ls command"
-HOMEPAGE="https://crates.io/crates/lsd ${HOMEPAGE}"
-
-LICENCES="Apache-2.0"
-SLOT="0"
 PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-"
-
-BUGS_TO="hasufell@posteo.de"
 
diff --git a/packages/sys-apps/lsd/lsd-0.12.0.exheres-0 b/packages/sys-apps/lsd/lsd.exlib
similarity index 59%
rename from packages/sys-apps/lsd/lsd-0.12.0.exheres-0
rename to packages/sys-apps/lsd/lsd.exlib
index 28dd8d5..c9fc625 100644
--- a/packages/sys-apps/lsd/lsd-0.12.0.exheres-0
+++ b/packages/sys-apps/lsd/lsd.exlib
@@ -1,15 +1,13 @@
 # Copyright 2019 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require cargo [ channel=stable ]
-require github [ user=Peltoche tag="${PV}" ]
+require bash-completion zsh-completion
 
 SUMMARY="The next gen ls command"
 HOMEPAGE="https://crates.io/crates/lsd ${HOMEPAGE}"
 
 LICENCES="Apache-2.0"
 SLOT="0"
-PLATFORMS="~amd64 ~x86"
 MYOPTIONS=""
 
 DEPENDENCIES="
@@ -17,6 +15,20 @@ DEPENDENCIES="
 
 BUGS_TO="hasufell@posteo.de"
 
+BASH_COMPLETIONS=( "${WORK}/completions/${PN}.bash" )
+ZSH_COMPLETIONS=( "${WORK}/completions/_${PN}" )
+
+src_compile() {
+    SHELL_COMPLETIONS_DIR="${WORK}/completions" \
+        cargo_src_compile
+}
+
+src_install() {
+    cargo_src_install
+    bash-completion_src_install
+    zsh-completion_src_install
+}
+
 src_test() {
     local test_socket="unix:${TEMP}/test_socket_type.*/socket.tmp"
     esandbox allow_net --bind "${test_socket}"