diff --git a/.gitignore b/.gitignore
index 5ea1685..b5bd0c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /libtpms-20210227.tar.xz
 /libtpms-20210301.tar.xz
 /libtpms-20210601.tar.xz
+/libtpms-20210624.tar.xz
diff --git a/libtpms.spec b/libtpms.spec
index 82b994d..4ffc11f 100644
--- a/libtpms.spec
+++ b/libtpms.spec
@@ -1,8 +1,8 @@
-%global gitdate   20210601
-%global gitversion 9e736d5281
+%global gitdate   20210624
+%global gitversion a594c4692a
 
 Name:           libtpms
-Version:        0.8.3
+Version:        0.8.4
 Release:        0.%{gitdate}git%{gitversion}%{?dist}.1
 
 Summary: Library providing Trusted Platform Module (TPM) functionality
@@ -55,7 +55,11 @@ find %{buildroot} -type f -name '*.la' | xargs rm -f -- || :
 %{_mandir}/man3/*
 
 %changelog
-* Mon Jun 01 2021 Stefan Berger <stefanb@linux.ibm.com> - 0.8.3-0.20210601git9e736d5281
+* Thu Jun 24 2021 Stefan Berger <stefanb@linux.ibm.com> - 0.8.4-0.20210625gita594c4692a
+- tpm2: Reset too large size indicators in TPM2B to avoid access beyond buffer
+- tpm2: Restore original value in buffer if unmarshalled one was illegal
+
+* Tue Jun 01 2021 Stefan Berger <stefanb@linux.ibm.com> - 0.8.3-0.20210601git9e736d5281
 - tpm2: Work-around for Windows 2016 & 2019 bug related to ContextLoad
 
 * Mon Mar 01 2021 Stefan Berger <stefanb@linux.ibm.com> - 0.8.2-0.20210301git729fc6a4ca
diff --git a/sources b/sources
index 9a30f9e..5d457cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libtpms-20210601.tar.xz) = 6a1777891e604aca060210a5442fe3dd77569e331078b2cab54c6ce4a993d348a75673accb13c7cb29882224bd21f9e8f4f599e535764e1f95ec447a42e4cf89
+SHA512 (libtpms-20210624.tar.xz) = 9ce76c303048fe3d1f3c93baf0b487271f76cf3e31c072b8020c74eb5d2bed44ba841b3540470a3ce6a7b9119d7d9613faec0938c7f9d72b1a43774b965eff1a