diff --git a/.gitignore b/.gitignore
index cff7def..c79d49f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /libtpms-20210624.tar.xz
 /libtpms-20210901.tar.xz
 /libtpms-20210910.tar.xz
+/libtpms-20210916.tar.xz
diff --git a/0001-build-sys-Add-Wno-deprecated-declarations-to-default.patch b/0001-build-sys-Add-Wno-deprecated-declarations-to-default.patch
deleted file mode 100644
index 5d3c5fb..0000000
--- a/0001-build-sys-Add-Wno-deprecated-declarations-to-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 082ead1db5165eec7679a0e01ff98a7b9bee44fa Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.ibm.com>
-Date: Tue, 14 Sep 2021 15:14:57 -0400
-Subject: [PATCH] build-sys: Add -Wno-deprecated-declarations to default CFLAGS
- (OSSL 3.0)
-
-To be able to build with OpenSSL 3.0 we need to added
--Wno-deprecated-declarations to the default CFLAGS.
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 405755f2..f4c44e12 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -303,7 +303,7 @@ if test "x$enable_hardening" != "xno"; then
- fi
- 
- CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign"
--CFLAGS="$CFLAGS -Wmissing-prototypes"
-+CFLAGS="$CFLAGS -Wmissing-prototypes -Wno-deprecated-declarations"
- LDFLAGS="$LDFLAGS $COVERAGE_LDFLAGS"
- 
- AC_CONFIG_FILES(Makefile                   \
--- 
-2.33.0
-
diff --git a/libtpms.spec b/libtpms.spec
index 17fe25c..004e0dd 100644
--- a/libtpms.spec
+++ b/libtpms.spec
@@ -1,17 +1,15 @@
-%global gitdate   20210910
-%global gitversion 7a4d46a119
+%global gitdate   20210916
+%global gitversion fb9f0a61e8
 
 Name:           libtpms
-Version:        0.8.6
-Release:        0.%{gitdate}git%{gitversion}%{?dist}.3
+Version:        0.8.7
+Release:        0.%{gitdate}git%{gitversion}%{?dist}
 
 Summary: Library providing Trusted Platform Module (TPM) functionality
 License:        BSD
 Url:            http://github.com/stefanberger/libtpms
 Source0:        libtpms-%{gitdate}.tar.xz
 
-Patch0001:      0001-build-sys-Add-Wno-deprecated-declarations-to-default.patch
-
 BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig gawk sed
 BuildRequires:  automake autoconf libtool bash coreutils gcc-c++
@@ -30,7 +28,6 @@ Libtpms header files and documentation.
 
 %prep
 %setup -q -n %{name}-%{gitdate}
-%patch0001 -p1
 %build
 NOCONFIGURE=1 sh autogen.sh
 %configure --disable-static --with-tpm2 --with-openssl
@@ -58,6 +55,9 @@ find %{buildroot} -type f -name '*.la' | xargs rm -f -- || :
 %{_mandir}/man3/*
 
 %changelog
+* Thu Sep 16 2021 Stefan Berger <stefanb@linux.ibm.com> - 0.8.7-0.20210916gitfb9f0a61e8
+- Build upcoming libtpms 0.8.7
+
 * Wed Sep 15 2021 Sahana Prasad <sahana@redhat.com> - 0.8.6-0.20210910git7a4d46a119.3
 - Rebuilt with OpenSSL 3.0.0
 
diff --git a/sources b/sources
index e56d1c4..534577d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libtpms-20210910.tar.xz) = ca63f41e55e320e29714c07523240a9bc327f68664ca622e7cab03d0531428d45469edcb9a934016172f0434b8ce8a77825c7af4cb587ad24741c3ad6b9d5662
+SHA512 (libtpms-20210916.tar.xz) = ef447240c2c80bf63304b075234c254ab36aa379169375e72e313e46908cb0da13d98deea5d26ca5004caea0af4a23b65b3f519201fde66b9809c74cf99dc5bf