diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,3 +1,5 @@
 libc.so.6
-libsystemd.so.0
+libjson-c.so.5
+libnvme.so.1
 libuuid.so.1
+libz.so.1
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -9,6 +9,7 @@
 libc.so.6:__isoc99_sscanf
 libc.so.6:__libc_start_main
 libc.so.6:__memcpy_chk
+libc.so.6:__open64_2
 libc.so.6:__printf_chk
 libc.so.6:__snprintf_chk
 libc.so.6:__sprintf_chk
@@ -16,18 +17,15 @@
 libc.so.6:__strcat_chk
 libc.so.6:__strcpy_chk
 libc.so.6:__strncpy_chk
-libc.so.6:__vasprintf_chk
 libc.so.6:__vsnprintf_chk
 libc.so.6:__xpg_basename
 libc.so.6:abort
 libc.so.6:accept
-libc.so.6:alphasort
-libc.so.6:basename
+libc.so.6:alphasort64
 libc.so.6:bind
 libc.so.6:calloc
 libc.so.6:clock_gettime
 libc.so.6:close
-libc.so.6:closedir
 libc.so.6:dirname
 libc.so.6:execlp
 libc.so.6:exit
@@ -35,25 +33,21 @@
 libc.so.6:fflush
 libc.so.6:fgetc
 libc.so.6:fgets
-libc.so.6:fopen
+libc.so.6:fopen64
 libc.so.6:fputc
 libc.so.6:fputs
 libc.so.6:free
-libc.so.6:freeaddrinfo
-libc.so.6:fstat
+libc.so.6:fstat64
 libc.so.6:fsync
 libc.so.6:fwrite
-libc.so.6:getaddrinfo
 libc.so.6:getcwd
 libc.so.6:getenv
 libc.so.6:getopt_long_only
 libc.so.6:getpagesize
-libc.so.6:getpid
+libc.so.6:getrandom
 libc.so.6:gettimeofday
 libc.so.6:gmtime
 libc.so.6:gmtime_r
-libc.so.6:inet_ntop
-libc.so.6:inet_pton
 libc.so.6:ioctl
 libc.so.6:localtime
 libc.so.6:localtime_r
@@ -61,10 +55,10 @@
 libc.so.6:memcpy
 libc.so.6:memset
 libc.so.6:mkdir
-libc.so.6:mmap
+libc.so.6:mmap64
 libc.so.6:munmap
-libc.so.6:open
-libc.so.6:opendir
+libc.so.6:open64
+libc.so.6:open_memstream
 libc.so.6:optarg
 libc.so.6:optind
 libc.so.6:pclose
@@ -77,11 +71,10 @@
 libc.so.6:rand
 libc.so.6:random
 libc.so.6:read
-libc.so.6:readdir
 libc.so.6:readlink
 libc.so.6:realloc
 libc.so.6:remove
-libc.so.6:scandir
+libc.so.6:scandir64
 libc.so.6:send
 libc.so.6:setlocale
 libc.so.6:setsockopt
@@ -89,10 +82,11 @@
 libc.so.6:snprintf
 libc.so.6:socket
 libc.so.6:srand
-libc.so.6:stat
+libc.so.6:stat64
 libc.so.6:stderr
 libc.so.6:stdin
 libc.so.6:stdout
+libc.so.6:strcasecmp
 libc.so.6:strchr
 libc.so.6:strcmp
 libc.so.6:strcspn
@@ -102,7 +96,6 @@
 libc.so.6:strlen
 libc.so.6:strncmp
 libc.so.6:strncpy
-libc.so.6:strndup
 libc.so.6:strpbrk
 libc.so.6:strrchr
 libc.so.6:strsep
@@ -118,6 +111,153 @@
 libc.so.6:tzset
 libc.so.6:usleep
 libc.so.6:write
-libsystemd.so.0:sd_id128_get_machine_app_specific
-libuuid.so.1:uuid_generate_random
+libjson-c.so.5:json_object_array_add
+libjson-c.so.5:json_object_new_array
+libjson-c.so.5:json_object_new_double
+libjson-c.so.5:json_object_new_int
+libjson-c.so.5:json_object_new_object
+libjson-c.so.5:json_object_new_string
+libjson-c.so.5:json_object_new_uint64
+libjson-c.so.5:json_object_object_add
+libjson-c.so.5:json_object_put
+libjson-c.so.5:json_object_to_json_string_ext
+libnvme.so.1:nvme_admin_passthru
+libnvme.so.1:nvme_capacity_mgmt
+libnvme.so.1:nvme_copy
+libnvme.so.1:nvme_create_ctrl
+libnvme.so.1:nvme_create_root
+libnvme.so.1:nvme_ctrl_first_ns
+libnvme.so.1:nvme_ctrl_first_path
+libnvme.so.1:nvme_ctrl_get_address
+libnvme.so.1:nvme_ctrl_get_firmware
+libnvme.so.1:nvme_ctrl_get_host_iface
+libnvme.so.1:nvme_ctrl_get_host_traddr
+libnvme.so.1:nvme_ctrl_get_model
+libnvme.so.1:nvme_ctrl_get_name
+libnvme.so.1:nvme_ctrl_get_serial
+libnvme.so.1:nvme_ctrl_get_state
+libnvme.so.1:nvme_ctrl_get_subsystem
+libnvme.so.1:nvme_ctrl_get_sysfs_dir
+libnvme.so.1:nvme_ctrl_get_traddr
+libnvme.so.1:nvme_ctrl_get_transport
+libnvme.so.1:nvme_ctrl_get_trsvcid
+libnvme.so.1:nvme_ctrl_identify
+libnvme.so.1:nvme_ctrl_is_discovery_ctrl
+libnvme.so.1:nvme_ctrl_next_ns
+libnvme.so.1:nvme_ctrl_next_path
+libnvme.so.1:nvme_ctrl_reset
+libnvme.so.1:nvme_ctrl_set_dhchap_key
+libnvme.so.1:nvme_ctrl_set_discovery_ctrl
+libnvme.so.1:nvme_dev_self_test
+libnvme.so.1:nvme_directive_recv
+libnvme.so.1:nvme_directive_send
+libnvme.so.1:nvme_disconnect_ctrl
+libnvme.so.1:nvme_dsm
+libnvme.so.1:nvme_dump_config
+libnvme.so.1:nvme_errno_to_string
+libnvme.so.1:nvme_first_host
+libnvme.so.1:nvme_first_subsystem
+libnvme.so.1:nvme_format_nvm
+libnvme.so.1:nvme_free_ctrl
+libnvme.so.1:nvme_free_ns
+libnvme.so.1:nvme_free_tree
+libnvme.so.1:nvme_fw_commit
+libnvme.so.1:nvme_fw_download
+libnvme.so.1:nvme_gen_dhchap_key
+libnvme.so.1:nvme_get_attr
+libnvme.so.1:nvme_get_ctrl_telemetry
+libnvme.so.1:nvme_get_feature_length
+libnvme.so.1:nvme_get_features
+libnvme.so.1:nvme_get_host_telemetry
+libnvme.so.1:nvme_get_lba_status
+libnvme.so.1:nvme_get_log
+libnvme.so.1:nvme_get_logical_block_size
+libnvme.so.1:nvme_get_new_host_telemetry
+libnvme.so.1:nvme_get_nsid
+libnvme.so.1:nvme_get_property
+libnvme.so.1:nvme_host_get_hostid
+libnvme.so.1:nvme_host_get_hostnqn
+libnvme.so.1:nvme_host_set_dhchap_key
+libnvme.so.1:nvme_identify
+libnvme.so.1:nvme_init_copy_range
+libnvme.so.1:nvme_init_ctrl_list
+libnvme.so.1:nvme_init_dsm_range
+libnvme.so.1:nvme_io
+libnvme.so.1:nvme_io_passthru
+libnvme.so.1:nvme_lockdown
+libnvme.so.1:nvme_lookup_ctrl
+libnvme.so.1:nvme_lookup_host
+libnvme.so.1:nvme_lookup_subsystem
+libnvme.so.1:nvme_namespace_filter
+libnvme.so.1:nvme_namespace_first_path
+libnvme.so.1:nvme_namespace_next_path
+libnvme.so.1:nvme_next_host
+libnvme.so.1:nvme_next_subsystem
+libnvme.so.1:nvme_ns_attach
+libnvme.so.1:nvme_ns_get_firmware
+libnvme.so.1:nvme_ns_get_lba_count
+libnvme.so.1:nvme_ns_get_lba_size
+libnvme.so.1:nvme_ns_get_lba_util
+libnvme.so.1:nvme_ns_get_meta_size
+libnvme.so.1:nvme_ns_get_model
+libnvme.so.1:nvme_ns_get_name
+libnvme.so.1:nvme_ns_get_nsid
+libnvme.so.1:nvme_ns_get_serial
+libnvme.so.1:nvme_ns_get_sysfs_dir
+libnvme.so.1:nvme_ns_mgmt
+libnvme.so.1:nvme_ns_rescan
+libnvme.so.1:nvme_path_get_ana_state
+libnvme.so.1:nvme_path_get_ctrl
+libnvme.so.1:nvme_path_get_name
+libnvme.so.1:nvme_path_get_ns
+libnvme.so.1:nvme_read_config
+libnvme.so.1:nvme_resv_acquire
+libnvme.so.1:nvme_resv_register
+libnvme.so.1:nvme_resv_release
+libnvme.so.1:nvme_resv_report
+libnvme.so.1:nvme_sanitize_nvm
+libnvme.so.1:nvme_scan
+libnvme.so.1:nvme_scan_ctrl
+libnvme.so.1:nvme_scan_namespace
+libnvme.so.1:nvme_scan_topology
+libnvme.so.1:nvme_security_receive
+libnvme.so.1:nvme_security_send
+libnvme.so.1:nvme_set_features
+libnvme.so.1:nvme_set_property
+libnvme.so.1:nvme_status_to_errno
+libnvme.so.1:nvme_status_to_string
+libnvme.so.1:nvme_submit_admin_passthru
+libnvme.so.1:nvme_submit_io_passthru
+libnvme.so.1:nvme_subsystem_first_ctrl
+libnvme.so.1:nvme_subsystem_first_ns
+libnvme.so.1:nvme_subsystem_get_host
+libnvme.so.1:nvme_subsystem_get_name
+libnvme.so.1:nvme_subsystem_get_nqn
+libnvme.so.1:nvme_subsystem_next_ctrl
+libnvme.so.1:nvme_subsystem_next_ns
+libnvme.so.1:nvme_subsystem_reset
+libnvme.so.1:nvme_update_config
+libnvme.so.1:nvme_virtual_mgmt
+libnvme.so.1:nvme_zns_append
+libnvme.so.1:nvme_zns_mgmt_recv
+libnvme.so.1:nvme_zns_mgmt_send
+libnvme.so.1:nvmf_add_ctrl
+libnvme.so.1:nvmf_adrfam_str
+libnvme.so.1:nvmf_cms_str
+libnvme.so.1:nvmf_connect_disc_entry
+libnvme.so.1:nvmf_default_config
+libnvme.so.1:nvmf_eflags_str
+libnvme.so.1:nvmf_get_discovery_log
+libnvme.so.1:nvmf_hostid_from_file
+libnvme.so.1:nvmf_hostnqn_from_file
+libnvme.so.1:nvmf_hostnqn_generate
+libnvme.so.1:nvmf_prtype_str
+libnvme.so.1:nvmf_qptype_str
+libnvme.so.1:nvmf_register_ctrl
+libnvme.so.1:nvmf_sectype_str
+libnvme.so.1:nvmf_subtype_str
+libnvme.so.1:nvmf_treq_str
+libnvme.so.1:nvmf_trtype_str
+libnvme.so.1:nvmf_update_config
 libuuid.so.1:uuid_unparse_lower
+libz.so.1:crc32
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,21 +1,24 @@
 name       : nvme-cli
-version    : '1.16'
-release    : 10
+version    : '2.0'
+release    : 11
 source     :
-    - https://github.com/linux-nvme/nvme-cli/archive/refs/tags/v1.16.tar.gz : 40f741020ab5c490374901cd2c0c9b6cf98dd5ff5f182517a0aec12c0e9aef55
+    - https://github.com/linux-nvme/nvme-cli/archive/refs/tags/v2.0.tar.gz : 471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
 license    : GPL-2.0-only
 component  : system.utils
 summary    : NVM-Express user space tooling for Linux.
 description: |
     NVM-Express user space tooling for Linux.
-environment: |
-    export CFLAGS="${CFLAGS} -I."
-    export PREFIX=/usr
-    export UDEVDIR=/usr/lib64/udev
+builddeps  :
+    - pkgconfig(libnvme)
+setup      : |
+    %meson_configure \
+        -Dudevrulesdir=lib64/udev/rules.d \
+        -Dsystemddir=lib/systemd/system \
+        -Ddocs=man
 build      : |
-    %make
+    %ninja_build
 install    : |
-    %make_install
+    %ninja_install
 
     # Remove default/example config
-    rm -r $installdir/etc/
+    rm -rv $installdir/etc/
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -44,6 +44,7 @@
             <Path fileType="man">/usr/share/man/man1/nvme-dera-stat.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-dim.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>
@@ -87,16 +88,8 @@
             <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-lockdown.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-mi-cmd-support-effects-log.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-micron-clear-pcie-errors.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-micron-internal-log.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-micron-nand-stats.1</Path>
@@ -109,6 +102,8 @@
             <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-nvm-id-ctrl.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-ocp-latency-monitor-log.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-ocp-smart-add-log.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-persistent-event-log.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-pred-lat-event-agg-log.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-predictable-lat-log.1</Path>
@@ -153,9 +148,12 @@
             <Path fileType="man">/usr/share/man/man1/nvme-wdc-drive-resize.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-wdc-enc-get-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-dev-capabilities-log.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-wdc-get-drive-status.1</Path>
+            <Path fileType="man">/usr/share/man/man1/nvme-wdc-get-error-recovery-log.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-wdc-get-latency-monitor-log.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-get-unsupported-reqs-log.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-wdc-id-ctrl.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-wdc-log-page-directory.1</Path>
             <Path fileType="man">/usr/share/man/man1/nvme-wdc-namespace-resize.1</Path>
@@ -190,12 +188,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="10">
-            <Date>2021-11-14</Date>
-            <Version>1.16</Version>
+        <Update release="11">
+            <Date>2022-04-18</Date>
+            <Version>2.0</Version>
             <Comment>Packaging update</Comment>
             <Name>Silke Hofstra</Name>
             <Email>silke@slxh.eu</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file