diff --git a/0001-g-11-requires-limits-header.patch b/0001-g-11-requires-limits-header.patch
new file mode 100644
index 0000000..88318db
--- /dev/null
+++ b/0001-g-11-requires-limits-header.patch
@@ -0,0 +1,24 @@
+From 3d1ff754f1588a72c179ad5c088debc5fea4b02f Mon Sep 17 00:00:00 2001
+From: Dirk Eddelbuettel <edd@debian.org>
+Date: Mon, 30 Nov 2020 09:41:49 -0600
+Subject: [PATCH] g++-11 requires limits header
+
+---
+ include/cpptoml.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/cpptoml.h b/include/cpptoml.h
+index 5a00da3..1dc9fd1 100644
+--- a/include/cpptoml.h
++++ b/include/cpptoml.h
+@@ -14,6 +14,7 @@
+ #include <cstring>
+ #include <fstream>
+ #include <iomanip>
++#include <limits>
+ #include <map>
+ #include <memory>
+ #include <sstream>
+-- 
+2.31.1
+
diff --git a/cpptoml.changes b/cpptoml.changes
index 1595ab3..6e4cf68 100644
--- a/cpptoml.changes
+++ b/cpptoml.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun  1 08:02:28 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add GCC 11 build fix:
+  * 0001-g-11-requires-limits-header.patch
+
 -------------------------------------------------------------------
 Fri May 14 08:38:18 UTC 2021 - Simon Lees <sflees@suse.de>
 
diff --git a/cpptoml.spec b/cpptoml.spec
index 21fefae..0ac0ea3 100644
--- a/cpptoml.spec
+++ b/cpptoml.spec
@@ -24,6 +24,8 @@ License:        MIT
 Group:          Development/Languages/C and C++
 URL:            https://github.com/skystrife/%{name}
 Source:         https://github.com/skystrife/%{name}/archive/v%{version}.tar.gz
+# PATCH-FIX-UPSTREAM https://github.com/skystrife/cpptoml/pull/123
+Patch0:         0001-g-11-requires-limits-header.patch
 BuildRequires:  cmake >= 3.1
 BuildRequires:  gcc-c++
 
@@ -40,10 +42,11 @@ cpptoml is a header-only c++ library for parsing TOML configuration files.
 This package contains development headers for the cpptoml library
 
 %prep
-%setup -q
-sed -ie "s,lib/cmake/cpptoml,%{_libdir}/cmake/%{name}," CMakeLists.txt
+%autosetup -p1
 
 %build
+sed -ie "s,lib/cmake/cpptoml,%{_libdir}/cmake/%{name}," CMakeLists.txt
+
 %cmake
 %cmake_build