diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,14 +1,14 @@
 name       : nvme-cli
-version    : 1.3
-release    : 2
+version    : '1.7'
+release    : 3
 source     :
-    - https://github.com/linux-nvme/nvme-cli/archive/v1.3.tar.gz : 52eb45c9ef5a529580a3f6f9e02c067695675ac01b8ab8b8e0398c62e8a8646d
-license    : GPL-2.0
+    - https://github.com/linux-nvme/nvme-cli/archive/v1.7.tar.gz : 3a139d40ffff48d2f0b06339fd3be3ed219241ce6838f0ea173d7459c9984ea2
+license    : GPL-2.0-only
 component  : system.utils
 summary    : NVM-Express user space tooling for Linux.
 description: |
     NVM-Express user space tooling for Linux.
 build      : |
-    %make
+    CFLAGS="${CFLAGS} -I." %make
 install    : |
     PREFIX=/usr %make_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,10 +2,10 @@
     <Source>
         <Name>nvme-cli</Name>
         <Packager>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Philipp Trulson</Name>
+            <Email>philipp@trulson.de</Email>
         </Packager>
-        <License>GPL-2.0</License>
+        <License>GPL-2.0-only</License>
         <PartOf>system.utils</PartOf>
         <Summary xml:lang="en">NVM-Express user space tooling for Linux.</Summary>
         <Description xml:lang="en">NVM-Express user space tooling for Linux.
@@ -19,18 +19,112 @@
 </Description>
         <PartOf>system.utils</PartOf>
         <Files>
-            <Path fileType="executable">/usr/sbin</Path>
-            <Path fileType="data">/usr/share/bash_completion.d/nvme</Path>
-            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="executable">/usr/sbin/nvme</Path>
+            <Path fileType="data">/usr/share/bash-completion/completions/nvme</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-admin-passthru.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-ana-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-attach-ns.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-changed-ns-list-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-compare.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-connect-all.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-connect.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-create-ns.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-delete-ns.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-detach-ns.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-device-self-test.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-dir-receive.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-dir-send.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-disconnect-all.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-disconnect.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-discover.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-dsm.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-effects-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-endurance-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-error-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-flush.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-format.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-fw-commit.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-fw-download.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-fw-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-gen-hostnqn.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-get-feature.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-get-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-get-ns-id.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-get-property.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-help.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-huawei-id-ctrl.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-huawei-list.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-id-ctrl.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-id-ns.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-id-nvmset.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-intel-id-ctrl.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-intel-internal-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-intel-lat-stats.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-intel-market-name.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-intel-smart-log-add.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-intel-temp-stats.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-io-passthru.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-list-ctrl.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-list-ns.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-list-subsys.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-list.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-create.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-diag-bbtbl.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-diag-set-bbtbl.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-factory.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-id-ns.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-info.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-init.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-list.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-lnvm-remove.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-netapp-smdevices.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-ns-descs.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-ns-rescan.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-read.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-reset.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-resv-acquire.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-resv-register.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-resv-release.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-resv-report.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-sanitize-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-sanitize.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-security-recv.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-security-send.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-self-test-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-set-feature.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-set-property.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-show-regs.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-smart-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-subsystem-reset.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-telemetry-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-toshiba-clear-pcie-correctable-errors.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-toshiba-vs-internal-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-toshiba-vs-smart-add-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-cap-diag.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-clear-pcie-corr.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-drive-essentials.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-drive-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-get-crash-dump.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-get-pfail-dump.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-id-ctrl.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-purge-monitor.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-purge.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-smart-add-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-vs-internal-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-write-uncor.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-write-zeroes.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-write.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme.1</Path>
+            <Path fileType="data">/usr/share/zsh/site-functions/_nvme</Path>
         </Files>
     </Package>
     <History>
-        <Update release="2">
-            <Date>2017-05-22</Date>
-            <Version>1.3</Version>
+        <Update release="3">
+            <Date>2019-03-22</Date>
+            <Version>1.7</Version>
             <Comment>Packaging update</Comment>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Philipp Trulson</Name>
+            <Email>philipp@trulson.de</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file