diff --git a/master_changes.md b/master_changes.md
index 80ddccb6505..93b1c5df97d 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -125,6 +125,7 @@ users)
   * Exclude the .git directory from the release archive when using GNU tar [#6066 @kit-ty-kate]
   * Ensure non-existing %.cache target fail with a fatal error [#6066 @kit-ty-kate]
   * Remove opam 2.1 support from the release script [#6084 #6175 @kit-ty-kate]
+  * Remove the getgroups workaround allowing users belonging to more than 32 groups [#6200 @dra27 @kit-ty-kate]
 
 ## Install script
   * Provide a shell/install.ps1 PowerShell script to install opam on Windows [#5906 @kit-ty-kate @dra27]
diff --git a/release/Dockerfile.in b/release/Dockerfile.in
index 77ce913a8c9..bc21c687941 100644
--- a/release/Dockerfile.in
+++ b/release/Dockerfile.in
@@ -14,7 +14,6 @@ RUN tar xzf %OCAMLV%.tar.gz
 WORKDIR ocaml-%OCAMLV%
 RUN sed -i 's/gnueabi/*eabi/' configure
 RUN sed -i 's/musl/musl*/' configure
-RUN sed -i -e 's/NGROUPS_MAX/65536/' otherlibs/unix/getgroups.c
 RUN ./configure %CONF% -prefix /usr/local
 RUN make "-j$(nproc)" && make install && rm -rf /root/ocaml-%OCAMLV% /root/ocaml-%OCAMLV%.tar.gz