diff --git a/cmake/ci.cmake b/cmake/ci.cmake
index e8795fd73..1e864d08c 100644
--- a/cmake/ci.cmake
+++ b/cmake/ci.cmake
@@ -111,7 +111,7 @@ set(GCC_CXXFLAGS "-std=c++11                          \
     -Wno-abi-tag                                         \
     -Waddress                                         \
     -Waddress-of-packed-member                        \
-    -Waggregate-return                                \
+    -Wno-aggregate-return                                \
     -Waggressive-loop-optimizations                   \
     -Waligned-new=all                                 \
     -Wall                                             \
diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp
index 663c2fbd3..9b770a371 100644
--- a/include/nlohmann/detail/macro_scope.hpp
+++ b/include/nlohmann/detail/macro_scope.hpp
@@ -40,6 +40,7 @@
 #if defined(__clang__)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wdocumentation"
+    #pragma GCC diagnostic ignored "-Wdocumentation-unknown-command"
 #endif
 
 // allow to disable exceptions
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 16afb8a6a..d123bb2d5 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -2252,6 +2252,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
 #if defined(__clang__)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wdocumentation"
+    #pragma GCC diagnostic ignored "-Wdocumentation-unknown-command"
 #endif
 
 // allow to disable exceptions