diff --git a/Golden_Repo/g/g2lib/g2lib-3.2.0-GCCcore-11.3.0.eb b/Golden_Repo/g/g2lib/g2lib-3.2.0-GCCcore-11.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..237239266b2ae0bbc1ae93dd4524228c5515d00c
--- /dev/null
+++ b/Golden_Repo/g/g2lib/g2lib-3.2.0-GCCcore-11.3.0.eb
@@ -0,0 +1,33 @@
+name = 'g2lib'
+version = '3.2.0'
+
+homepage = 'https://www.nco.ncep.noaa.gov/pmb/codes/GRIB2/'
+description = """Library contains GRIB2 encoder/decoder and search/indexing routines."""
+
+toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
+
+source_urls = [homepage]
+sources = ['%(name)s-%(version)s.tar']
+patches = [
+    '%(name)s-%(version)s_makefile.patch',
+]
+checksums = [
+    '9d3866de32e13e80798bfb08dbbea9223f32cec3fce3c57b6838e76f27d5a1d3',  # g2lib-3.2.0.tar
+    # g2lib-3.2.0_makefile.patch
+    'e434394a6ec8bd68dbd57e3fdb44c47372b07380e362ed955bb038b78dd81812',
+]
+
+builddependencies = [('binutils', '2.38')]
+
+dependencies = [
+    ('JasPer', '2.0.33'),
+    ('libpng', '1.6.37'),
+]
+
+buildopts = 'CFLAGS="$CFLAGS -DLINUXG95 -D__64BIT__" FC=$FC CC=$CC '
+buildopts += 'FFLAGS="$FFLAGS -fno-range-check -fallow-invalid-boz -fallow-argument-mismatch -I."'
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'data'
diff --git a/Golden_Repo/g/g2lib/g2lib-3.2.0_makefile.patch b/Golden_Repo/g/g2lib/g2lib-3.2.0_makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1841fa47e0f0185e7a3e4562b98986ef5a0d4d80
--- /dev/null
+++ b/Golden_Repo/g/g2lib/g2lib-3.2.0_makefile.patch
@@ -0,0 +1,40 @@
+# Author: maxim-masterov (SURF)
+# Based on: g2lib-3.1.0_makefile.patch by Samuel Moors (VUB)
+# Fixes order of compilation and indentation in the makefile
+diff -Nru g2lib-3.2.0.orig/makefile g2lib-3.2.0/makefile
+--- g2lib-3.2.0.orig/makefile	2021-08-20 11:12:18.401270276 +0200
++++ g2lib-3.2.0/makefile	2021-08-20 11:16:07.212439526 +0200
+@@ -171,6 +171,7 @@
+ .SUFFIXES: .a .f .F .c
+ 
+ $(LIB):	$(LIB)(gridtemplates.o) \
++	$(LIB)(intmath.o) \
+ 	$(LIB)(pdstemplates.o) \
+ 	$(LIB)(drstemplates.o) \
+ 	$(LIB)(gribmod.o) \
+@@ -182,7 +183,6 @@
+ 	$(LIB)(gb_info.o) \
+ 	$(LIB)(gf_getfld.o) \
+ 	$(LIB)(gf_free.o) \
+-        $(LIB)(intmath.o) \
+ 	$(LIB)(gf_unpack1.o) \
+ 	$(LIB)(gf_unpack2.o) \
+ 	$(LIB)(gf_unpack3.o) \
+@@ -217,7 +217,7 @@
+ 	$(LIB)(pngunpack.o) \
+ 	$(LIB)(enc_png.o) \
+ 	$(LIB)(dec_png.o) \
+-        $(LIB)(mova2i.o) \
++	$(LIB)(mova2i.o) \
+ 	$(LIB)(g2_gbytesc.o) \
+ 	$(LIB)(skgb.o) \
+ 	$(LIB)(ixgb2.o) \
+@@ -232,7 +232,7 @@
+ 	$(LIB)(putgb2.o) \
+ 	$(LIB)(g2grids.o) \
+ 	$(LIB)(params.o) \
+-        $(LIB)(params_ecmwf.o) \
++	$(LIB)(params_ecmwf.o) \
+ 	$(LIB)(getidx.o) \
+ 	$(LIB)(gdt2gds.o)
+