diff --git a/packages/sys-apps/lsd/lsd-0.15.1.exheres-0 b/packages/sys-apps/lsd/lsd-0.15.1.exheres-0
index 28dd8d5a..a57e582f 100644
--- a/packages/sys-apps/lsd/lsd-0.15.1.exheres-0
+++ b/packages/sys-apps/lsd/lsd-0.15.1.exheres-0
@@ -3,24 +3,7 @@
 
 require cargo [ channel=stable ]
 require github [ user=Peltoche tag="${PV}" ]
+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"
-
-src_test() {
-    local test_socket="unix:${TEMP}/test_socket_type.*/socket.tmp"
-    esandbox allow_net --bind "${test_socket}"
-    cargo_src_test
-    esandbox disallow_net "${test_socket}"
-}
 
diff --git a/packages/sys-apps/lsd/lsd-scm.exheres-0 b/packages/sys-apps/lsd/lsd-scm.exheres-0
index d3aadb83..f49000da 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.exlib b/packages/sys-apps/lsd/lsd.exlib
new file mode 100644
index 00000000..c9fc6253
--- /dev/null
+++ b/packages/sys-apps/lsd/lsd.exlib
@@ -0,0 +1,38 @@
+# Copyright 2019 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require bash-completion zsh-completion
+
+SUMMARY="The next gen ls command"
+HOMEPAGE="https://crates.io/crates/lsd ${HOMEPAGE}"
+
+LICENCES="Apache-2.0"
+SLOT="0"
+MYOPTIONS=""
+
+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}"
+    cargo_src_test
+    esandbox disallow_net "${test_socket}"
+}
+