diff --git a/SOURCES/dmpd-remove-pool-inactive-from-thin_trim-man-page.patch b/SOURCES/dmpd-remove-pool-inactive-from-thin_trim-man-page.patch
new file mode 100644
index 00000000..cb32de9b
--- /dev/null
+++ b/SOURCES/dmpd-remove-pool-inactive-from-thin_trim-man-page.patch
@@ -0,0 +1,17 @@
+ man8/thin_trim.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/man8/thin_trim.txt b/man8/thin_trim.txt
+index 1d24a06..e19d8bd 100644
+--- a/man8/thin_trim.txt
++++ b/man8/thin_trim.txt
+@@ -12,9 +12,6 @@ DESCRIPTION
+ OPTIONS
+   -h, --help		Print help and exit.
+   -V, --version		Print version information and exit.
+-  --pool-inactive	Indicates you are aware the pool should be inactive.
+-
+-    Suppresses a warning message and prompt.
+ 
+ SEE ALSO
+   thin_dump(8), thin_repair(8), thin_restore(8), thin_rmap(8), thin_metadata_size(8)
diff --git a/SOURCES/dmpd-space-map-noop-explicit-option-return.patch b/SOURCES/dmpd-space-map-noop-explicit-option-return.patch
new file mode 100644
index 00000000..149008aa
--- /dev/null
+++ b/SOURCES/dmpd-space-map-noop-explicit-option-return.patch
@@ -0,0 +1,16 @@
+ persistent-data/space-maps/noop.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/persistent-data/space-maps/noop.h b/persistent-data/space-maps/noop.h
+index 500dae8..6f71290 100644
+--- a/persistent-data/space-maps/noop.h
++++ b/persistent-data/space-maps/noop.h
+@@ -61,7 +61,7 @@ namespace persistent_data {
+ 
+ 		maybe_block find_free(span_iterator &it) {
+ 			fail();
+-			return 0;
++			return boost::optional<block_address>(0);
+ 		}
+ 
+ 		bool count_possibly_greater_than_one(block_address b) const {
diff --git a/SPECS/device-mapper-persistent-data.spec b/SPECS/device-mapper-persistent-data.spec
index d3218243..1d159828 100644
--- a/SPECS/device-mapper-persistent-data.spec
+++ b/SPECS/device-mapper-persistent-data.spec
@@ -4,15 +4,17 @@
 
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
-Version: 0.7.3
-Release: 3%{?dist}
+Version: 0.8.5
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: https://github.com/jthornber/thin-provisioning-tools
 #Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-% {version}.tar.gz
 Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
 Patch0: device-mapper-persistent-data-avoid-strip.patch
-Patch1: device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch
+Patch1: dmpd-space-map-noop-explicit-option-return.patch
+# BZ 1528261:
+Patch2: dmpd-remove-pool-inactive-from-thin_trim-man-page.patch
 
 BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel
 Requires: expat
@@ -28,7 +30,8 @@ snapshot eras
 %prep
 %setup -q -n thin-provisioning-tools-%{version}
 %patch0 -p1 -b .avoid_strip
-%patch1 -p1 -b .v2_dirty_bitset
+%patch1 -p1 -b .explicit_option_return
+%patch2 -p1 -b .remove_pool_inactive_option
 echo %{version}-%{release} > VERSION
 
 %build
@@ -84,6 +87,18 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 %{_sbindir}/thin_trim
 
 %changelog
+* Tue Nov 19 2019 Marian Csontos <mcsontos@redhat.com> - 0.8.5-2
+- Remove obsolete pool-inactive option from thin_trim man page.
+
+* Mon Jun 10 2019 Marian Csontos <mcsontos@redhat.com> - 0.8.5-1
+- Additional fixes for thin_dump and thin_repair.
+
+* Mon May 27 2019 Marian Csontos <mcsontos@redhat.com> - 0.8.2-1
+- Fix tools requiring additional --repair option.
+
+* Sat May 04 2019 Marian Csontos <mcsontos@redhat.com> - 0.8.1-1
+- Update to latest upstream release including various bug fixes.
+
 * Tue Nov 14 2017 Marian Csontos <mcsontos@redhat.com> - 0.7.3-3
 - Fix version 2 metadata corruption in cache_restore.