diff --git a/.gitignore b/.gitignore
index e63cb43..764c6fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /mbedtls-2.16.9.tar.gz
 /mbedtls-2.16.11.tar.gz
 /mbedtls-2.16.12.tar.gz
+/mbedtls-2.28.0.tar.gz
diff --git a/mbedtls.spec b/mbedtls.spec
index dfc52e7..725cbd8 100644
--- a/mbedtls.spec
+++ b/mbedtls.spec
@@ -2,9 +2,13 @@
 %global _docdir_fmt %{name}
 %endif
 
+%if 0%{?fedora} || 0%{?rhel}
+%global debug_package %{nil}
+%endif
+
 Name: mbedtls
-Version: 2.16.12
-Release: 2%{?dist}
+Version: 2.28.0
+Release: 1%{?dist}
 Summary: Light-weight cryptographic and SSL/TLS library
 License: ASL 2.0
 URL: https://tls.mbed.org/
@@ -18,10 +22,8 @@ BuildRequires: graphviz
 BuildRequires: perl-interpreter
 BuildRequires: python3
 
-# replace polarssl with mbedtls
-
-Obsoletes: polarssl < 1.3.10
-Provides:  polarssl = %{version}-%{release}
+Obsoletes: mbedtls-utils < 2.28.0-0
+Obsoletes: mbedtls-static < 2.28.0-0
 
 %description
 Mbed TLS is a light-weight open source cryptographic and SSL/TLS
@@ -30,15 +32,6 @@ cryptographic and SSL/TLS capabilities in their (embedded)
 applications with as little hassle as possible.
 FOSS License Exception: https://tls.mbed.org/foss-license-exception
 
-%package        utils
-Summary:        Utilities for %{name}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Obsoletes:      polarssl-utils < 1.3.10
-Provides:       polarssl-utils = %{version}-%{release}
-
-%description    utils
-Cryptographic utilities based on %{name}. 
-
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -49,14 +42,6 @@ Provides:       polarssl-devel = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%package        static
-Summary:        Static files for %{name}
-Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
-
-%description    static
-The %{name}-static package contains static files for
-developing applications that use %{name}.
-
 %package        doc
 Summary:        Documentation files for %{name}
 BuildArch:      noarch
@@ -72,13 +57,17 @@ sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h
 sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h
 
 %build
+export CFLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized"
+export CXXLAGS="%{optflags} -Wno-stringop-overflow -Wno-maybe-uninitialized"
 
 %cmake \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DLINK_WITH_PTHREAD=ON \
 	-DINSTALL_MBEDTLS_HEADERS=ON \
+	-DENABLE_PROGRAMS=OFF \
 	-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
-	-DUSE_STATIC_MBEDTLS_LIBRARY=ON
+	-DUSE_STATIC_MBEDTLS_LIBRARY=OFF \
+	-DGEN_FILES=OFF
 
 %cmake_build
 make apidoc
@@ -86,11 +75,8 @@ make apidoc
 %install
 %cmake_install
 
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls
-
 %check
-%ctest
+%ctest --output-on-failure --force-new-ctest-process --parallel 1
 
 %ldconfig_scriptlets
 
@@ -100,20 +86,19 @@ mv $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_libexecdir}/mbedtls
 %license LICENSE
 %{_libdir}/*.so.*
 
-%files utils
-%{_libexecdir}/%{name}/
-
 %files devel
 %{_includedir}/mbedtls/
+%{_includedir}/psa/
 %{_libdir}/*.so
 
-%files static
-%{_libdir}/*.a
-
 %files doc
 %doc apidoc/*
 
 %changelog
+* Sat Jan 22 2022 Morten Stevens <mstevens@fedoraproject.org> - 2.28.0-1
+- Update to 2.28.0
+- Dropped support for utils and static subpackage
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.16.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 14688e8..701a8dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mbedtls-2.16.12.tar.gz) = 8d96d8cd906cc0999134320e4e1f550631426d166eab5da6e65469ee7286093810fcc6ac4bd5500ee55972d159f8bef7f9e53245f7f0eec72f72c35265b4313b
+SHA512 (mbedtls-2.28.0.tar.gz) = 907867edf532ba3b099f4fb7ce31f5773ceceb072a8d067b1d830e879d541f92f401d64f13bbe6b4eb0845e58bb765d7d28896be414bb0fc7ac5b3876066be5f