diff --git a/.gitignore b/.gitignore
index 647d307..dd2df6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
 /libblockdev-2.15.tar.gz
 /libblockdev-2.16.tar.gz
 /libblockdev-2.17.tar.gz
+/libblockdev-2.18.tar.gz
diff --git a/libblockdev.spec b/libblockdev.spec
index 5fb2897..b374313 100644
--- a/libblockdev.spec
+++ b/libblockdev.spec
@@ -15,8 +15,10 @@
 %define with_part 1
 %define with_fs 1
 %define with_nvdimm 1
+%define with_vdo 1
 %define with_gi 1
 %define with_escrow 1
+%define with_dmraid 1
 
 # python2 is not available on RHEL > 7 and not needed on Fedora > 28
 %if 0%{?rhel} > 7 || 0%{?fedora} > 28 || %{with_python2} == 0
@@ -42,6 +44,12 @@
 %define lvm_dbus_copts --without-lvm-dbus
 %endif
 
+# vdo is not available on Fedora
+%if (0%{?fedora}) || %{with_vdo} == 0
+%define with_vdo 0
+%define vdo_copts --without-vdo
+%endif
+
 %if %{with_btrfs} != 1
 %define btrfs_copts --without-btrfs
 %endif
@@ -54,6 +62,10 @@
 %endif
 %if %{with_dm} != 1
 %define dm_copts --without-dm
+%else
+%if %{with_dmraid} != 1
+%define dm_copts --without-dmraid
+%endif
 %endif
 %if %{with_loop} != 1
 %define loop_copts --without-loop
@@ -85,15 +97,18 @@
 %if %{with_nvdimm} != 1
 %define nvdimm_copts --without-nvdimm
 %endif
+%if %{with_vdo} != 1
+%define vdo_copts --without-vdo
+%endif
 %if %{with_gi} != 1
 %define gi_copts --disable-introspection
 %endif
 
-%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} %{?gi_copts}
+%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}
 
 Name:        libblockdev
-Version:     2.17
-Release:     2%{?dist}
+Version:     2.18
+Release:     1%{?dist}
 Summary:     A library for low-level manipulation with block devices
 License:     LGPLv2+
 URL:         https://github.com/storaged-project/libblockdev
@@ -239,7 +254,9 @@ with the libblockdev-crypto plugin/library.
 %if %{with_dm}
 %package dm
 BuildRequires: device-mapper-devel
+%if %{with_dmraid}
 BuildRequires: dmraid-devel
+%endif
 BuildRequires: systemd-devel
 Summary:     The Device Mapper plugin for the libblockdev library
 Requires: %{name}-utils%{?_isa} >= 0.11
@@ -256,7 +273,9 @@ Requires: %{name}-dm%{?_isa} = %{version}-%{release}
 Requires: glib2-devel
 Requires: device-mapper-devel
 Requires: systemd-devel
+%if %{with_dmraid}
 Requires: dmraid-devel
+%endif
 Requires: %{name}-utils-devel%{?_isa}
 
 %description dm-devel
@@ -504,6 +523,31 @@ with the libblockdev-swap plugin/library.
 %endif
 
 
+%if %{with_vdo}
+%package vdo
+BuildRequires: libbytesize-devel
+BuildRequires: libyaml-devel
+Summary:     The vdo plugin for the libblockdev library
+Requires: %{name}-utils%{?_isa} >= 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 vdo-devel
+Summary:     Development files for the libblockdev-vdo plugin/library
+Requires: %{name}-vdo%{?_isa} = %{version}-%{release}
+Requires: %{name}-utils-devel%{?_isa}
+Requires: glib2-devel
+
+%description vdo-devel
+This package contains header files and pkg-config files needed for development
+with the libblockdev-vdo plugin/library.
+%endif
+
+
 %ifarch s390 s390x
 %package s390
 Summary:    The s390 plugin for the libblockdev library
@@ -576,6 +620,10 @@ Requires: %{name}-part%{?_isa} = %{version}-%{release}
 Requires: %{name}-swap%{?_isa} = %{version}-%{release}
 %endif
 
+%if %{with_vdo}
+Requires: %{name}-vdo%{?_isa} = %{version}-%{release}
+%endif
+
 %ifarch s390 s390x
 Requires: %{name}-s390%{?_isa} = %{version}-%{release}
 %endif
@@ -647,6 +695,10 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %ldconfig_scriptlets swap
 %endif
 
+%if %{with_vdo}
+%ldconfig_scriptlets vdo
+%endif
+
 %ifarch s390 s390x
 %ldconfig_scriptlets s390
 %endif
@@ -855,6 +907,17 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %endif
 
 
+%if %{with_vdo}
+%files vdo
+%{_libdir}/libbd_vdo.so.*
+
+%files vdo-devel
+%{_libdir}/libbd_vdo.so
+%dir %{_includedir}/blockdev
+%{_includedir}/blockdev/vdo.h
+%endif
+
+
 %ifarch s390 s390x
 %files s390
 %{_libdir}/libbd_s390.so.*
@@ -868,6 +931,30 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %files plugins-all
 
 %changelog
+* Wed Jun 20 2018 Vojtech Trefny <vtrefny@redhat.com> - 2.18-1
+- Add VDO to features.rst (vtrefny)
+- Remove roadmap.rst (vtrefny)
+- vdo: Add tests for bd_vdo_grow_physical() (tbzatek)
+- Do not try to build VDO plugin on Fedora (vtrefny)
+- Introduce reporting function per thread (kailueke)
+- vdo: Implement bd_vdo_grow_physical() (tbzatek)
+- Correct arguments for ext4 repair with progress (kailueke)
+- Clarify that checking an RW-mounted XFS file system is impossible (v.podzimek)
+- vdo: Resolve real device file path (tbzatek)
+- Adjust to new NVDIMM namespace modes (vtrefny)
+- Use xfs_repair instead of xfs_db in bd_fs_xfs_check() (v.podzimek)
+- Allow compiling libblockdev without libdmraid (vtrefny)
+- Only require plugins we really need in LVM dbus tests (vtrefny)
+- Add tests for VDO plugin (vtrefny)
+- Add decimal units definition to utils/sizes.h (vtrefny)
+- Add basic VDO plugin functionality (vtrefny)
+- Add the VDO plugin (vtrefny)
+- Always check for error when (un)mounting (vtrefny)
+- Fix off-by-one error when counting TCRYPT keyfiles (segfault)
+- Add 'bd_dm_is_tech_avail' to header file (vtrefny)
+- Fix release number in NEWS.rst (vtrefny)
+- Update specs.rst and features.rst (vtrefny)
+
 * Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.17-2
 - Rebuilt for Python 3.7
 
diff --git a/sources b/sources
index 062182d..36de3f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libblockdev-2.17.tar.gz) = 8aa46e8430c18e586693057af59e0dc396426bcfe32a8b526969dafd50c5092f293e2656a03dba872d550fd6655d53bedef3f880a117d939688f1491b9c62c8a
+SHA512 (libblockdev-2.18.tar.gz) = 65e2f795ced3e902af889f3bd9e303234e1611fb25555123b4edaf0b1e3aca24d399422f96eb0694ada025e57ddeb207f60c8666d0640110e228cfb8da92d5ab