$ git diff --patch-with-stat --summary dfe3e34a5eda71a6ddd05acbfac12c7e74795fb4..bc79d4954fa9583966ca2fb121cd718af3bcceb8

 .abf.yml         |   2 +-
 libblockdev.spec | 296 +++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 199 insertions(+), 99 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 80cf0b6..d8a2abb 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  2.14-1.tar.gz: 215824307f20c3569e32bc957c08dcaaba82ed34
+  libblockdev-2.20.tar.gz: 5066dbd1098e433fe713a04b14033d130d041888
diff --git a/libblockdev.spec b/libblockdev.spec
index 1a0c657..ee79e52 100644
--- a/libblockdev.spec
+++ b/libblockdev.spec
@@ -1,49 +1,56 @@
 %define major 2
 
-%define libbdutils	%mklibname bd_utils %{major}
-%define libbdutilsdev	%mklibname -d bd_utils
+%define libbdutils %mklibname bd_utils %{major}
+%define libbdutilsdev %mklibname -d bd_utils
 
-%define libblock	%mklibname blockdev %{major}
-%define libblockdev	%mklibname -d blockdev
+%define libblock %mklibname blockdev %{major}
+%define libblockdev %mklibname -d blockdev
 
-%define libbdbtrfs	%mklibname bd_btrfs %{major}
-%define libbdbtrfsdev	%mklibname -d bd_btrfs
+%define libbdbtrfs %mklibname bd_btrfs %{major}
+%define libbdbtrfsdev %mklibname -d bd_btrfs
 
-%define libbdcrypto	%mklibname bd_crypto %{major}
-%define libbdcryptodev	%mklibname -d bd_crypto
+%define libbdcrypto %mklibname bd_crypto %{major}
+%define libbdcryptodev %mklibname -d bd_crypto
 
-%define libbddm		%mklibname bd_dm %{major}
-%define libbddmdev	%mklibname -d bd_dm
+%define libbddm %mklibname bd_dm %{major}
+%define libbddmdev %mklibname -d bd_dm
 
-%define libbdloop	%mklibname bd_loop %{major}
-%define libbdloopdev	%mklibname -d bd_loop
+%define libbdloop %mklibname bd_loop %{major}
+%define libbdloopdev %mklibname -d bd_loop
 
-%define libbdlvm	%mklibname bd_lvm %{major}
-%define libbdlvmdev	%mklibname -d bd_lvm
+%define libbdlvm %mklibname bd_lvm %{major}
+%define libbdlvmdev %mklibname -d bd_lvm
 # /libbd_lvm-dbus.so
-%define libbdlvmdbus	%mklibname bd_lvm-dbus %{major}
+%define libbdlvmdbus %mklibname bd_lvm-dbus %{major}
 %define libbdlvmdbusdev %mklibname -d bd_lvm-dbus
 # libbd_mdraid.so
-%define libbdmdraid	%mklibname bd_mdraid %{major}
-%define libbdmdraiddev	%mklibname -d bd_mdraid
+%define libbdmdraid %mklibname bd_mdraid %{major}
+%define libbdmdraiddev %mklibname -d bd_mdraid
 # libbd_mpath.so.*
-%define libdbmpath	%mklibname bd_mpath %{major}
-%define libbdmpathdev	%mklibname -d bd_mpath
+%define libdbmpath %mklibname bd_mpath %{major}
+%define libbdmpathdev %mklibname -d bd_mpath
 # /libbd_swap.so.
-%define libdbswap	%mklibname bd_swap %{major}
-%define libbdswapdev	%mklibname -d bd_swap
+%define libdbswap %mklibname bd_swap %{major}
+%define libbdswapdev %mklibname -d bd_swap
 # /libbd_part.so.
-%define libdbpart	%mklibname bd_part %{major}
-%define libbdpartdev	%mklibname -d bd_part
+%define libdbpart %mklibname bd_part %{major}
+%define libbdpartdev %mklibname -d bd_part
 # /libbd_part_err.so.
-%define libdbparterr	%mklibname bd_part_err %{major}
-%define libbdparterrdev	%mklibname -d bd_part_err
+%define libdbparterr %mklibname bd_part_err %{major}
+%define libbdparterrdev %mklibname -d bd_part_err
 # /libbd_kbd.so.
-%define libdbkbd	%mklibname bd_kbd %{major}
-%define libbdkbddev	%mklibname -d bd_kbd
+%define libdbkbd %mklibname bd_kbd %{major}
+%define libbdkbddev %mklibname -d bd_kbd
 # libbd_fs.so.
-%define libdbfs	%mklibname bd_fs %{major}
-%define libbdfsdev	%mklibname -d bd_fs
+%define libdbfs %mklibname bd_fs %{major}
+%define libbdfsdev %mklibname -d bd_fs
+
+# libbd_nvdimm.so.
+%define libdbnvdimm %mklibname bd_nvdimm %{major}
+%define libdbnvdimmdev %mklibname -d bd_nvdimm
+# libbd_vdo.so.
+%define libdbvdo %mklibname bd_vdo %{major}
+%define libbdvdodev %mklibname -d bd_vdo
 
 
 %define Werror_cflags %nil
@@ -64,7 +71,14 @@
 %define with_part_err 1
 %define with_fs 1
 %define with_gi 1
+%define with_nvdimm 0
+%define with_vdo 0
+%define with_python2 0
 
+# python2 is not available on RHEL > 7 and not needed on Fedora > 29
+%if %{with_python2} != 1
+%define python2_copts --without-python2
+%endif
 %if %{with_btrfs} != 1
 %define btrfs_copts --without-btrfs
 %endif
@@ -104,28 +118,36 @@
 %if %{with_gi} != 1
 %define gi_copts --disable-introspection
 %endif
+%if %{with_nvdimm} != 1
+%define nvdimm_copts --without-nvdimm
+%endif
+%if %{with_vdo} != 1
+%define vdo_copts --without-vdo
+%endif
 
-%define configure_opts %{?distro_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts} %{?gi_copts}
 
-Name:        libblockdev
-Version:     2.14
-Release:     3.1
-Summary:     A library for low-level manipulation with block devices
-License:     LGPLv2+
-URL:         https://github.com/rhinstaller/libblockdev
-Source0:     https://github.com/storaged-project/libblockdev/archive/%{version}-1.tar.gz
-Source1:     libblockdev.rpmlintrc
+%define configure_opts %{?python2_copts} %{?python3_copts} %{?bcache_copts} %{?lvm_dbus_copts} %{?btrfs_copts} %{?crypto_copts} %{?dm_copts} %{?loop_copts} %{?lvm_copts} %{?lvm_dbus_copts} %{?mdraid_copts} %{?mpath_copts} %{?swap_copts} %{?kbd_copts} %{?part_copts} %{?fs_copts} %{?nvdimm_copts} %{?vdo_copts} %{?gi_copts}
 
-BuildRequires: pkgconfig(glib-2.0)
+Name:		libblockdev
+Version:	2.20
+Release:	1
+Summary:	A library for low-level manipulation with block devices
+License:	LGPLv2+
+URL:		https://github.com/rhinstaller/libblockdev
+Source0:	https://github.com/storaged-project/libblockdev/releases/download/%{version}-1/%{name}-%{version}.tar.gz
+Source1:	libblockdev.rpmlintrc
+BuildRequires:	pkgconfig(libkmod)
+BuildRequires:	pkgconfig(glib-2.0)
+BuildRequires:	pkgconfig(yaml-0.1)
 %if %{with_gi}
-BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires:	pkgconfig(gobject-introspection-1.0)
 %endif
 %if %{with_python3}
-BuildRequires: python-devel
+BuildRequires:	pkgconfig(python)
 %endif
 %define with_gtk_doc 0
 %if %{with_gtk_doc}
-BuildRequires: gtk-doc
+BuildRequires:	gtk-doc
 %endif
 
 # Needed for the escrow tests in tests/crypto_test.py, but not used to build
@@ -145,16 +167,16 @@ be used as standalone libraries. One of the core principles of libblockdev is
 that it is stateless from the storage configuration's perspective (e.g. it has
 no information about VGs when creating an LV).
 
-%package -n	%{libblock}
+%package -n %{libblock}
 Summary:	Libblockdev libraries
 Group:		System/Libraries
 
-%description -n	%{libblock}
+%description -n %{libblock}
 The libblockdev is a C library with GObject introspection support that can be
 used for doing low-level operations with block devices like setting up LVM,
 BTRFS, LUKS or MD RAID.
 
-%package -n	%{libblockdev}
+%package -n %{libblockdev}
 Summary:	Development files for libblockdev
 Requires:	%{libblock} = %{version}-%{release}
 Requires:	pkgconfig(glib-2.0)
@@ -164,7 +186,7 @@ This package contains header files and pkg-config files needed for development
 with the libblockdev library.
 
 %if %{with_python3}
-%package -n	python-blockdev
+%package -n python-blockdev
 Summary:	Python3 gobject-introspection bindings for libblockdev
 Requires:	%{libblock} = %{version}-%{release}
 
@@ -174,13 +196,13 @@ libblockdev in Python3.
 %endif
 
 %package -n %{libbdutils}
-Summary:     A library with utility functions for the libblockdev library
+Summary:	A library with utility functions for the libblockdev library
 
 %description -n %{libbdutils}
 The libblockdev-utils is a library providing utility functions used by the
 libblockdev library and its plugins.
 
-%package -n	%{libbdutilsdev}
+%package -n %{libbdutilsdev}
 Summary:	Development files for libblockdev-utils
 Requires:	%{libbdutils} = %{version}-%{release}
 Requires:	pkgconfig(glib-2.0)
@@ -200,7 +222,7 @@ Requires:	btrfs-progs
 The libblockdev library plugin (and in the same time a standalone library)
 providing the BTRFS-related functionality.
 
-%package -n	%{libbdbtrfsdev}
+%package -n %{libbdbtrfsdev}
 Summary:	Development files for the libblockdev-btrfs plugin/library
 Provides:	bd_btrfs-devel = %{EVRD}
 Requires:	%{libbdbtrfs} = %{version}-%{release}
@@ -214,16 +236,16 @@ with the libblockdev-btrfs plugin/library.
 
 %if %{with_crypto}
 %package -n %{libbdcrypto}
-BuildRequires: pkgconfig(libcryptsetup)
-BuildRequires: volume_key-devel
-BuildRequires: nss-devel
-Summary:     The crypto plugin for the libblockdev library
+BuildRequires:	pkgconfig(libcryptsetup)
+BuildRequires:	volume_key-devel
+BuildRequires:	nss-devel
+Summary:	The crypto plugin for the libblockdev library
 
 %description -n %{libbdcrypto}
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to encrypted devices (LUKS).
 
-%package -n	%{libbdcryptodev}
+%package -n %{libbdcryptodev}
 Summary:	Development files for the libblockdev-crypto plugin/library
 Provides:	bd_crypto-devel = %{EVRD}
 Requires:	%{libbdcrypto} = %{version}-%{release}
@@ -234,8 +256,31 @@ This package contains header files and pkg-config files needed for development
 with the libblockdev-crypto plugin/library.
 %endif
 
+%if %{with_vdo}
+%package -n %{libdbvdo}
+BuildRequires: pkgconfig(bytesize)
+BuildRequires: pkgconfig(yaml-0.1)
+Summary:     The vdo plugin for the libblockdev library
+Requires: %{name}-utils >= 0.11
+Requires: vdo
+Requires: kmod-kvdo
+
+%description vdo
+The libblockdev library plugin (and in the same time a standalone library)
+providing the functionality related to VDO devices.
+
+%package -n	%{libdbvdodev}
+Summary:	Development files for the libblockdev-vdo plugin/library
+Requires:	%{libdbvdo} = %{EVRD}
+Requires:       pkgconfig(glib-2.0)
+
+%description -n %{libdbvdodev}
+This package contains header files and pkg-config files needed for development
+with the libblockdev-vdo plugin/library.
+%endif
+
 %if %{with_part_err}
-%package -n	%{libdbparterr}
+%package -n %{libdbparterr}
 BuildRequires:	pkgconfig(libcryptsetup)
 Summary:	A library with utility functions for the libblockdev library
 Requires:	%{libbdutils} = %{version}-%{release}
@@ -244,7 +289,7 @@ Requires:	%{libbdutils} = %{version}-%{release}
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to encrypted devices (LUKS).
 
-%package -n	%{libbdparterrdev}
+%package -n %{libbdparterrdev}
 Summary:	Development files for the libblockdev-crypto plugin/library
 Provides:	bd_part_err-devel = %{EVRD}
 Requires:	%{libdbparterr} = %{EVRD}
@@ -257,25 +302,25 @@ with the libblockdev-crypto plugin/library.
 %endif
 
 %if %{with_dm}
-%package -n	%{libbddm}
-BuildRequires:	device-mapper-devel
+%package -n %{libbddm}
+BuildRequires:	pkgconfig(devmapper)
 BuildRequires:	%{_lib}dmraid-devel
 BuildRequires:	pkgconfig(systemd)
 Summary:	The Device Mapper plugin for the libblockdev library
 Requires:	%{libbdutils}
-Requires:	device-mapper
+Requires:	pkgconfig(devmapper)
 Requires:	dmraid
 
 %description -n %{libbddm}
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to Device Mapper.
 
-%package -n	%{libbddmdev}
+%package -n %{libbddmdev}
 Summary:	Development files for the libblockdev-dm plugin/library
 Provides:	bd_dm-devel = %{EVRD}
 Requires:	%{libbddm} = %{EVRD}
 Requires:	pkgconfig(glib-2.0)
-Requires:	device-mapper-devel
+Requires:	pkgconfig(devmapper)
 Requires:	pkgconfig(systemd)
 Requires:	dmraid-devel
 Requires:	%{libbdutilsdev}
@@ -286,7 +331,7 @@ with the libblockdev-dm plugin/library.
 %endif
 
 %if %{with_fs}
-%package -n	%{libdbfs}
+%package -n %{libdbfs}
 BuildRequires:	parted-devel
 BuildRequires:	pkgconfig(blkid)
 BuildRequires:	pkgconfig(mount)
@@ -298,7 +343,7 @@ Requires:	multipath-tools
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to operations with file systems.
 
-%package -n	%{libbdfsdev}
+%package -n %{libbdfsdev}
 Summary:	Development files for the libblockdev-fs plugin/library
 Provides:	bd_fs-devel = %{EVRD}
 Requires:	%{libdbfs} = %{version}-%{release}
@@ -333,21 +378,21 @@ Requires:	%{libdbkbd} = %{EVRD}
 Requires:	%{libbdutilsdev}
 Requires:	pkgconfig(glib-2.0)
 
-%description	-n %{libbdkbddev}
+%description -n %{libbdkbddev}
 This package contains header files and pkg-config files needed for development
 with the libblockdev-kbd plugin/library.
 %endif
 
 %if %{with_loop}
 %package -n %{libbdloop}
-Summary:     The loop plugin for the libblockdev library
-Requires: %{libbdutils}
+Summary:	The loop plugin for the libblockdev library
+Requires:	%{libbdutils}
 
 %description -n %{libbdloop}
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to loop devices.
 
-%package -n	%{libbdloopdev}
+%package -n %{libbdloopdev}
 Summary:	Development files for the libblockdev-loop plugin/library
 Provides:	bd_loop-devel = %{EVRD}
 Requires:	%{libbdloop} = %{EVRD}
@@ -360,8 +405,8 @@ with the libblockdev-loop plugin/library.
 %endif
 
 %if %{with_lvm}
-%package -n	%{libbdlvm}
-BuildRequires:	device-mapper-devel
+%package -n %{libbdlvm}
+BuildRequires:	pkgconfig(devmapper)
 Summary:	The LVM plugin for the libblockdev library
 Requires:	%{libbdutils}
 Requires:	lvm2
@@ -373,7 +418,7 @@ Requires:	lvm2
 The libblockdev library plugin (and in the same time a standalone library)
 providing the LVM-related functionality.
 
-%package -n	%{libbdlvmdev}
+%package -n %{libbdlvmdev}
 Summary:	Development files for the libblockdev-lvm plugin/library
 Provides:	bd_lvm-devel = %{EVRD}
 Requires:	%{libbdlvm} = %{version}-%{release}
@@ -386,8 +431,8 @@ with the libblockdev-lvm plugin/library.
 %endif
 
 %if %{with_lvm_dbus}
-%package -n	%{libbdlvmdbus}
-BuildRequires:	device-mapper-devel
+%package -n %{libbdlvmdbus}
+BuildRequires:	pkgconfig(devmapper)
 Summary:	The LVM plugin for the libblockdev library
 Requires:	%{libbdutils}
 Requires:	lvm2-dbusd >= 2.02.156
@@ -398,7 +443,7 @@ Requires:	thin-provisioning-tools
 The libblockdev library plugin (and in the same time a standalone library)
 providing the LVM-related functionality utilizing the LVM DBus API.
 
-%package -n	%{libbdlvmdbusdev}
+%package -n %{libbdlvmdbusdev}
 Summary:	Development files for the libblockdev-lvm-dbus plugin/library
 Provides:	bd_lvm-dbus-devel = %{EVRD}
 Requires:	%{libbdlvmdbus} = %{EVRD}
@@ -417,11 +462,11 @@ Summary:	The MD RAID plugin for the libblockdev library
 Requires:	%{libbdutils}
 Requires:	mdadm
 
-%description	-n %{libbdmdraid}
+%description -n %{libbdmdraid}
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to MD RAID.
 
-%package -n	%{libbdmdraiddev}
+%package -n %{libbdmdraiddev}
 Summary:	Development files for the libblockdev-mdraid plugin/library
 Provides:	bd_mdraid-devel = %{EVRD}
 Requires:	%{libbdmdraid} = %{EVRD}
@@ -433,9 +478,32 @@ This package contains header files and pkg-config files needed for development
 with the libblockdev-mdraid plugin/library.
 %endif
 
+%if %{with_nvdimm}
+%package -n %{libdbnvdimm}
+BuildRequires:	pkgconfig(libndctl)
+BuildRequires:	libuuid-devel
+Summary:	The NVDIMM plugin for the libblockdev library
+Requires:       %{libbdutils}
+Requires:	ndctl
+
+%description -n %{libdbnvdimm}
+The libblockdev library plugin (and in the same time a standalone library)
+providing the functionality related to operations with NVDIMM devices.
+
+%package -n %{libdbnvdimmdev}
+Summary:	Development files for the libblockdev-mpath plugin/library
+Provides:	bd_mpath-devel = %{EVRD}
+Requires:	%{libdbnvdimm} = %{EVRD}
+
+%description -n %{libdbnvdimmdev}
+This package contains header files and pkg-config files needed for development
+with the libblockdev-mpath plugin/library.
+%endif
+
+
 %if %{with_mpath}
 %package -n %{libdbmpath}
-BuildRequires:	device-mapper-devel
+BuildRequires:	pkgconfig(devmapper)
 Summary:	The multipath plugin for the libblockdev library
 Requires:	%{libbdutils}
 Requires:	multipath-tools
@@ -444,7 +512,7 @@ Requires:	multipath-tools
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to multipath devices.
 
-%package -n	%{libbdmpathdev}
+%package -n %{libbdmpathdev}
 Summary:	Development files for the libblockdev-mpath plugin/library
 Provides:	bd_mpath-devel = %{EVRD}
 Requires:	%{libdbmpath} = %{EVRD}
@@ -457,7 +525,7 @@ with the libblockdev-mpath plugin/library.
 %endif
 
 %if %{with_part}
-%package -n	%{libdbpart}
+%package -n %{libdbpart}
 BuildRequires:	parted-devel
 Summary:	The partitioning plugin for the libblockdev library
 Requires:	%{libbdutils}
@@ -465,24 +533,24 @@ Requires:	multipath-tools
 Requires:	gdisk
 Requires:	util-linux
 
-%description -n	%{libdbpart}
+%description -n %{libdbpart}
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to partitioning.
 
-%package -n	%{libbdpartdev}
+%package -n %{libbdpartdev}
 Summary:	Development files for the libblockdev-part plugin/library
 Provides:	bd_part-devel = %{EVRD}
 Requires:	%{libdbpart} = %{EVRD}
 Requires:	%{libbdutilsdev}
 Requires:	pkgconfig(glib-2.0)
 
-%description -n	%{libdbpart}
+%description -n %{libbdpartdev}
 This package contains header files and pkg-config files needed for development
 with the libblockdev-part plugin/library.
 %endif
 
 %if %{with_swap}
-%package -n	%{libdbswap}
+%package -n %{libdbswap}
 Summary:	The swap plugin for the libblockdev library
 Requires:	%{libbdutils}
 Requires:	util-linux
@@ -491,7 +559,7 @@ Requires:	util-linux
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to swap devices.
 
-%package -n	%{libbdswapdev}
+%package -n %{libbdswapdev}
 Summary:	Development files for the libblockdev-swap plugin/library
 Provides:	bd_swap-devel = %{version}-%{release}
 Requires:	%{libdbswap} = %{version}-%{release}
@@ -505,27 +573,27 @@ with the libblockdev-swap plugin/library.
 
 %ifarch s390 s390x
 %package s390
-BuildRequires: s390utils-devel
-Summary:    The s390 plugin for the libblockdev library
-Requires: s390utils
+BuildRequires:	s390utils-devel
+Summary:	The s390 plugin for the libblockdev library
+Requires:	s390utils
 
 %description s390
 The libblockdev library plugin (and in the same time a standalone library)
 providing the functionality related to s390 devices.
 
 %package s390-devel
-Summary:     Development files for the libblockdev-s390 plugin/library
-Requires: %{name}-s390 = %{version}-%{release}
-Requires: %{libbdutilsdev}
-Requires: pkgconfig(glib-2.0)
-Requires: s390utils-devel
+Summary:	Development files for the libblockdev-s390 plugin/library
+Requires:	%{name}-s390 = %{version}-%{release}
+Requires:	%{libbdutilsdev}
+Requires:	pkgconfig(glib-2.0)
+Requires:	s390utils-devel
 
 %description s390-devel
 This package contains header files and pkg-config files needed for development
 with the libblockdev-s390 plugin/library.
 %endif
 
-%package	plugins-all
+%package plugins-all
 Summary:	Meta-package that pulls all the libblockdev plugins as dependencies
 Requires:	%{libblock} = %{version}-%{release}
 
@@ -565,9 +633,18 @@ Requires:	%{libbdmdraid} = %{version}-%{release}
 Requires:	%{libdbmpath} = %{version}-%{release}
 %endif
 
+%if %{with_nvdimm}
+Requires:	%{libdbnvdimm} = %{version}-%{release}
+%endif
+
+%if %{with_vdo}
+Requires:	%{libdbvdo} = %{version}-%{release}
+%endif
+
 %if %{with_part_err}
 Requires: 	%{libdbparterr} = %{version}-%{release}
 %endif
+
 %if %{with_part}
 Requires:	%{libdbpart} = %{version}-%{release}
 %endif
@@ -577,23 +654,22 @@ Requires:	%{libdbswap} = %{version}-%{release}
 %endif
 
 %ifarch s390 s390x
-Requires: %{name}-s390 = %{version}-%{release}
+Requires:	%{name}-s390 = %{version}-%{release}
 %endif
 
 %description plugins-all
 A meta-package that pulls all the libblockdev plugins as dependencies.
 
 %prep
-%setup -q -n %{name}-%{version}-1
-sed -i 's!-Werror!!g' configure.ac src/utils/Makefile.am src/plugins/Makefile.am
+%setup -q
 
 %build
 export
-%configure %{?configure_opts}
-%{__make} %{?_smp_mflags}
+%configure %{?configure_opts} --without-gtk-doc
+%make_build
 
 %install
-%{make_install}
+%make_install
 find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 
 %files -n %{libblock}
@@ -611,6 +687,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %dir %{_includedir}/blockdev
 %{_includedir}/blockdev/blockdev.h
 %{_includedir}/blockdev/plugins.h
+%{_includedir}/blockdev/dbus.h
+%{_includedir}/blockdev/module.h
+%dir %{_includedir}/blockdev/fs
+%{_includedir}/blockdev/fs/*.h
 %{_libdir}/pkgconfig/blockdev.pc
 %if %{with_gtk_doc}
 %{_datadir}/gtk-doc/html/libblockdev
@@ -765,6 +845,26 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %{_includedir}/blockdev/swap.h
 %endif
 
+%if %{with_nvdimm}
+%files -n %{libdbnvdimm}
+%{_libdir}/libbd_nvdimm.so.%{major}*
+
+%files -n %{libdbnvdimmdev}
+%{_libdir}/libbd_nvdimm.so
+%dir %{_includedir}/blockdev
+%{_includedir}/blockdev/nvdimm.h
+%endif
+
+%if %{with_vdo}
+%files -n %{libdbvdo}
+{_libdir}/libbd_vdo.so.%{major}*
+
+%files -n %{libdbvdodev}
+%{_libdir}/libbd_vdo.so
+%dir %{_includedir}/blockdev
+%{_includedir}/blockdev/vdo.h
+%endif
+
 %ifarch s390 s390x
 %files s390
 %{_libdir}/libbd_s390.so.*