diff --git a/.gitignore b/.gitignore
index d5d6726..6f842db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /mbedtls-2.16.4-apache.tgz
 /mbedtls-2.16.5-apache.tgz
 /mbedtls-2.16.6-apache.tgz
+/mbedtls-2.16.7.tar.gz
diff --git a/mbedtls.spec b/mbedtls.spec
index 05dbb74..8fcba7d 100644
--- a/mbedtls.spec
+++ b/mbedtls.spec
@@ -3,12 +3,12 @@
 %endif
 
 Name: mbedtls
-Version: 2.16.6
+Version: 2.16.7
 Release: 1%{?dist}
 Summary: Light-weight cryptographic and SSL/TLS library
 License: ASL 2.0
 URL: https://tls.mbed.org/
-Source0: https://tls.mbed.org/download/%{name}-%{version}-apache.tgz
+Source0: https://tls.mbed.org/download/%{name}-%{version}.tar.gz
 
 BuildRequires: gcc-c++
 BuildRequires: cmake
@@ -70,13 +70,14 @@ BuildArch:      noarch
 The %{name}-doc package contains documentation.
 
 %prep
-%autosetup
+%autosetup -n mbedtls-mbedtls-2.16.7
 
 sed -i 's|//\(#define MBEDTLS_PKCS11_C\)|\1|' include/mbedtls/config.h
 sed -i 's|//\(#define MBEDTLS_HAVEGE_C\)|\1|' include/mbedtls/config.h
 sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h
 sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h
 sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' include/mbedtls/config.h
+sed -i 's|//\(#define MBEDTLS_CMAC_C\)|\1|' include/mbedtls/config.h
 
 %build
 
@@ -122,6 +123,10 @@ LD_LIBRARY_PATH=$PWD/library ctest --output-on-failure -V
 %doc apidoc/*
 
 %changelog
+* Tue Jul 14 2020 Morten Stevens <mstevens@fedoraproject.org> - 2.16.7-1
+- Update to 2.16.7
+- Security Advisory 2020-07
+
 * Wed May 27 2020 Morten Stevens <mstevens@fedoraproject.org> - 2.16.6-1
 - Update to 2.16.6
 - Security Advisory 2020-04 (CVE-2020-10932)
diff --git a/sources b/sources
index 1faf1f1..b7992e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mbedtls-2.16.6-apache.tgz) = a0c48b694d7bc70256d26c44bfb2ac802428560b02e50fe2e47762bc595e2c7b8fac934badb3452acb01d8a54386eafae0ff2894320d24ab7554f1c8e6cb4bcf
+SHA512 (mbedtls-2.16.7.tar.gz) = 57374061ec8ec7cbb745aa08235d17d4566435c7ad861c0a9fdc8957e09c1ea6619f0deb8a22040fa3674d0fab58ca353879eac1388e710c81840a7ae1225b9f