diff --git a/.gitignore b/.gitignore
index 223e0b0..5a4332d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/tpm2-tools-3.0.4.tar.gz
+/tpm2-tools-3.1.0.tar.gz
diff --git a/sources b/sources
index af1750d..2b6af6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tpm2-tools-3.0.4.tar.gz) = e92535d2983a6781036179bf208b37215e23921e99d5a08c44766c1a4fe1e0991585297775c4ca69e8c6cefa6a5d32c9948dc9ac837607ca1c498f43a2d4f394
+SHA512 (tpm2-tools-3.1.0.tar.gz) = a5779701a227cffa6d90a5840ac113cfd4cf60cf231930c3a03774ae8522acbcea697c92a2b80f7fd3b1630cc6c12fc97bdd47ae8bbccd10e8ace968954b020b
diff --git a/tpm2-tools.spec b/tpm2-tools.spec
index 57ee84a..3e3bb7d 100644
--- a/tpm2-tools.spec
+++ b/tpm2-tools.spec
@@ -1,5 +1,5 @@
 Name: tpm2-tools
-Version: 3.0.4
+Version: 3.1.0
 Release: 1%{?dist}
 Summary: A TPM2.0 testing tool build upon TPM2.0-TSS
 
@@ -14,14 +14,13 @@ BuildRequires: autoconf-archive
 BuildRequires: pkgconfig(cmocka)
 BuildRequires: pkgconfig(libcurl)
 BuildRequires: pkgconfig(openssl)
-# tpm2-tss-devel provides sapi/tcti-device/tcti-socket
-BuildRequires: pkgconfig(sapi)
-BuildRequires: pkgconfig(tcti-device)
-BuildRequires: pkgconfig(tcti-socket)
-BuildRequires: pkgconfig(tcti-tabrmd)
+# tpm2-tss-devel provides tss2-mu/sys/esys package config
+BuildRequires: pkgconfig(tss2-mu)
+BuildRequires: pkgconfig(tss2-sys)
+BuildRequires: pkgconfig(tss2-esys)
 
 # tpm2-tools is heavily depending on TPM2.0-TSS project, matched tss is required
-Requires: tpm2-tss%{?_isa} >= 1.3.0-1%{?dist}
+Requires: tpm2-tss%{?_isa} >= 2.0.0-2%{?dist}
 
 # tpm2-tools project changed the install path for binaries and man page section
 Obsoletes: tpm2-tools <= 2.1.1-2
@@ -46,6 +45,12 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
 %{_mandir}/man1/tpm2_*.1.gz
 
 %changelog
+* Thu Jul 5 2018 Yunying Sun <yunying.sun@intel.com> - 3.1.0-1
+- Update Requires version of tpm2-tss to 2.0.0
+- Remove BuildRequires for tcti-abrmd since it is optional
+- Remove BuildRequires for tcti-{device,mssim} as it is now dynamically loaded
+- Update to 3.1.0 release
+
 * Mon Apr 30 2018 Javier Martinez Canillas <javierm@redhat.com> - 3.0.4-1
 - Update URLs to point to the new project location
 - Update to 3.0.4 release