diff --git a/easybuild/easyconfigs/x/XBeach/XBeach-20230831-gompi-2022a.eb b/easybuild/easyconfigs/x/XBeach/XBeach-20230831-gompi-2022a.eb
new file mode 100644
index 00000000000..d6d2377b1fd
--- /dev/null
+++ b/easybuild/easyconfigs/x/XBeach/XBeach-20230831-gompi-2022a.eb
@@ -0,0 +1,49 @@
+easyblock = 'ConfigureMake'
+
+name = 'XBeach'
+# revision 6044
+version = '20230831'
+
+homepage = 'https://oss.deltares.nl/web/xbeach'
+description = """
+XBeach is a two-dimensional model for wave propagation, long waves and mean flow, sediment 
+transport and morphological changes of the nearshore area, beaches, dunes and backbarrier 
+during storms. 
+"""
+
+toolchain = {'name': 'gompi', 'version': '2022a'}
+toolchainopts = {'usempi': True}
+
+# There is no tarball provided, only SVN checkout through: 
+# svn checkout https://svn.oss.deltares.nl/repos/xbeach/trunk@6044
+# make tarball: tar -czvf XBeach-20230831.tgz trunk
+
+sources = [SOURCE_TGZ]
+patches = ['XBeach-20230831_fix-gfortran-compilation.patch']
+checksums = [
+    None,
+    '9aa8a3593ea641a16a6d09bb75cc9935de383b5934f4a2718eeb94382386f0c4',
+]
+
+prebuildopts = 'make clean && '
+
+dependencies = [
+    ('Mako', '1.2.0'),
+    ('netCDF-Fortran', '4.6.0'),
+]
+
+parallel = 1
+
+configopts = '--with-netcdf'
+preconfigopts = './autogen.sh && '
+preconfigopts += 'export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${EBROOTNETCDFMINFORTRAN}/lib/pkgconfig" && '
+
+sanity_check_paths = {
+    'files': ['bin/xbeach', 'lib/libxbeach.a', 'lib/libxbeach.la', 'lib/libxbeach.%s' % SHLIB_EXT],
+    'dirs': []
+}
+sanity_check_commands = [
+    'xbeach -V |grep "You are using XBeach" 2>/dev/null',
+]
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/x/XBeach/XBeach-20230831_fix-gfortran-compilation.patch b/easybuild/easyconfigs/x/XBeach/XBeach-20230831_fix-gfortran-compilation.patch
new file mode 100644
index 00000000000..cf14a126030
--- /dev/null
+++ b/easybuild/easyconfigs/x/XBeach/XBeach-20230831_fix-gfortran-compilation.patch
@@ -0,0 +1,19 @@
+Fix compilation with gfortran, see https://github.com/openearth/xbeach/issues/2
+author: Cintia Willemyns (HPC-VUB)
+--- trunk.orig/src/xbeachlibrary/mnemoniciso.F90	2023-09-18 11:46:34.153048000 +0200
++++ trunk/src/xbeachlibrary/mnemoniciso.F90	2023-09-18 11:46:41.583851000 +0200
+@@ -10,10 +10,10 @@
+       character(kind=c_char) type         ! 'i' or 'r': integer or real*8
+       character(kind=c_char) btype        ! 'b' or 'd':
+       integer(c_int) rank           ! 0,1,2,3,4
+-      character(kind=c_char, len=maxnamelen) :: name     ! 'v','ve', .....
+-      character(kind=c_char, len=20) :: units     ! m, following udunits convention
+-      character(kind=c_char, len=1024) :: description
+-      character(kind=c_char, len=20), dimension(maxrank) :: dimensions ! the dimensions of the variable, for example (s%nx, s%ny)
++      character(kind=c_char) :: name(maxnamelen)     ! 'v','ve', .....
++      character(kind=c_char) :: units(20) ! m, following udunits convention
++      character(kind=c_char) :: description(1024)
++      character(kind=c_char), dimension(maxrank) :: dimensions(20)
+ 
+       type (c_ptr) :: array
+