diff --git a/Golden_Repo/m/mpiP/mpiP-3.5-gpsmpi-2021b.eb b/Golden_Repo/m/mpiP/mpiP-3.5-gpsmpi-2021b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e4557e6d3e9385e2a53c98779878cbc3df06a694
--- /dev/null
+++ b/Golden_Repo/m/mpiP/mpiP-3.5-gpsmpi-2021b.eb
@@ -0,0 +1,44 @@
+easyblock = 'ConfigureMake'
+version = '3.5'
+
+homepage = 'https://github.com/LLNL/mpiP'
+name = "mpiP"
+
+description = """mpiP is a lightweight profiling library for MPI applications. Because it only collects statistical
+information about MPI functions, mpiP generates considerably less overhead and much less data than tracing tools. All
+the information captured by mpiP is task-local. It only uses communication during report generation, typically at the
+end of the experiment, to merge results from all of the tasks into one output file.
+"""
+
+usage = """
+ Example usage (take special note of the order, the mpiP library has to appear AFTER your code):
+
+    mpifort -g -o mpitest mpitest.f90 -lmpiP -lm -lbfd -liberty -lunwind -lz
+"""
+
+
+toolchain = {'name': 'gpsmpi', 'version': '2021b'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/LLNL/mpiP/releases/download/%(version)s/']
+sources = [SOURCELOWER_TGZ]
+checksums = ['e366843d53fa016fb03903e51c8aac901aa5155edabe64698a8d6fa618a03bbd']
+
+builddependencies = [
+    ('Python', '3.9.6'),
+]
+
+dependencies = [
+    ('libunwind', '1.5.0'),
+]
+
+configopts = "--with-cc=$CC --with-cxx=$CXX --with-f77=$F77 CFLAGS='-DPACKAGE=mpiP -DPACKAGE_VERSION=3.5' "
+
+buildopts = "PACKAGE='mpiP' PACKAGE_VERSION='3.5'"
+
+sanity_check_paths = {
+    'files': ['lib/libmpiP.so'],
+    'dirs': ['lib', 'share']
+}
+
+moduleclass = 'perf'
diff --git a/bin/gcc11ize.py b/bin/gcc11ize.py
index f0e063a492d36816fa78497fa732837647d5c3a9..3cab84f03e9770286a5460f12fc212175e829f9b 100755
--- a/bin/gcc11ize.py
+++ b/bin/gcc11ize.py
@@ -84,6 +84,7 @@ releases = {
     'libreadline':              ['8.0',             '8.1'],
     'librsvg':                  ['2.48.8',          '2.51.2'],
     'LibTIFF':                  ['4.1.0',           '4.3.0'],
+    'libunwind':                ['1.4,0',           '1.5.0'],
     'libxc':                    ['5.1.5',           '5.1.6'],
     'libxml2':                  ['2.9.10',          '2.9.10'],
     'LLVM':                     ['10.0.1',          '13.0.0'],