diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 2ec339eed..306d5bad7 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        gcc_v: [7, 8, 9, 10] # Version of GFortran we want to use.
+        gcc_v: [7, 8, 9, 10, 11] # Version of GFortran we want to use.
     env:
       FC: gfortran-${{ matrix.gcc_v }}
       GCC_V: ${{ matrix.gcc_v }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 414e8addb..4e06b0250 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,9 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
   add_compile_options(-Wconversion-extra)
   # -pedantic-errors triggers a false positive for optional arguments of elemental functions,
   # see test_optval and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95446
-  add_compile_options(-pedantic-errors)
+  if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 11.0)
+    add_compile_options(-pedantic-errors)
+  endif()
   if(CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
     add_compile_options(-std=f2018)
   else()
diff --git a/README.md b/README.md
index 431b86872..f87a2ef9d 100644
--- a/README.md
+++ b/README.md
@@ -87,8 +87,8 @@ The following combinations are tested on the default branch of stdlib:
 
 Name | Version | Platform | Architecture
 --- | --- | --- | ---
-GCC Fortran | 7, 8, 9, 10 | Ubuntu 20.04 | x86_64
-GCC Fortran | 7, 8, 9, 10 | MacOS Catalina 10.15 | x86_64
+GCC Fortran | 7, 8, 9, 10, 11 | Ubuntu 20.04 | x86_64
+GCC Fortran | 7, 8, 9, 10, 11 | MacOS Catalina 10.15 | x86_64
 GCC Fortran | 8 | Windows Server 2019 | x86_64
 GCC Fortran (MSYS) | 10 | Windows Server 2019 | x86_64
 GCC Fortran (MinGW) | 10 | Windows Server 2019 | x86_64, i686