diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
index e7896586ddf064bdf70e0e70a98a98dbf436a6b2..4b6ccca744514a21a962566ce26f948084d9d58d 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -12,6 +12,10 @@ toolchain = {'name': 'GCC', 'version': '11.2.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
index 9e34ca629e78a2a6bc5cc781fbb2d028dbe4c2d7..683a9a89bcbf5826a793ce59672de13f650287d3 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -13,6 +13,10 @@ toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
index dc30d1611b13a8c8855bbf8fce250b802e7fd7cb..a145e5dd2e6f823f089eae6ec01c2ba2234061ea 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -12,6 +12,10 @@ toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
diff --git a/Golden_Repo/p/psmpi/psmpi_shebang.patch b/Golden_Repo/p/psmpi/psmpi_shebang.patch
index 0ee53ac268735fd7f859d02d7f0f00d33b9a6a05..3fa1addb4933086fe98c728006242843b0c7c4a8 100644
--- a/Golden_Repo/p/psmpi/psmpi_shebang.patch
+++ b/Golden_Repo/p/psmpi/psmpi_shebang.patch
@@ -13,24 +13,24 @@ diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpicxx.bash.in psmpi-5.2.0-1/mpich2/s
 @@ -1,4 +1,4 @@
 -#! @BASH_SHELL@
 +#!/usr/bin/env bash
- # 
- # (C) 2006 by Argonne National Laboratory.
- #     See COPYRIGHT in top-level directory.
+ ##
+ ## (C) 2006 by Argonne National Laboratory.
+ ##     See COPYRIGHT in top-level directory.
 diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpif77.bash.in psmpi-5.2.0-1/mpich2/src/env/mpif77.bash.in
 --- psmpi-5.2.0-1.old/mpich2/src/env/mpif77.bash.in	2017-03-08 20:47:13.160276506 +0100
 +++ psmpi-5.2.0-1/mpich2/src/env/mpif77.bash.in	2017-03-08 20:47:55.148288103 +0100
 @@ -1,4 +1,4 @@
 -#! @BASH_SHELL@
 +#!/usr/bin/env bash
- #
- # (C) 2006 by Argonne National Laboratory.
- #     See COPYRIGHT in top-level directory.
+ ##
+ ## (C) 2006 by Argonne National Laboratory.
+ ##     See COPYRIGHT in top-level directory.
 diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpifort.bash.in psmpi-5.2.0-1/mpich2/src/env/mpifort.bash.in
 --- psmpi-5.2.0-1.old/mpich2/src/env/mpifort.bash.in	2017-03-08 20:47:13.160276506 +0100
 +++ psmpi-5.2.0-1/mpich2/src/env/mpifort.bash.in	2017-03-08 20:48:08.913947609 +0100
 @@ -1,4 +1,4 @@
 -#! @BASH_SHELL@
 +#!/usr/bin/env bash
- #
- # (C) 2006 by Argonne National Laboratory.
- #     See COPYRIGHT in top-level directory.
+ ##
+ ## (C) 2006 by Argonne National Laboratory.
+ ##     See COPYRIGHT in top-level directory.
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
index b6c50f4e6e5e3cd0bed8443319d9bc2dc711d0e7..2b2660b3c403518799af4f27d6f421645d6aedbe 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -12,6 +12,10 @@ toolchain = {'name': 'GCC', 'version': '11.2.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
index 32fab4fcd1c9e55027180465bdbfe9dcd50deacb..0ac13af0943aa13dd1af5e19d22c249ffe120222 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -13,6 +13,10 @@ toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
index 04f0bcf820b23f46fc2db72057db67ac32375d27..b7239e6a32df7891801e57de0c29ff65c976243f 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -12,6 +12,10 @@ toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
index 1afe2ae1b4333c6562805379dfc5ae443abfa739..0848cb67e6ebbe5ed7b720b599f9de99b0eb1326 100644
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -23,7 +23,11 @@ patches = [
     'psmpi_shebang.patch',
 ]
 
-builddependencies = [('popt', '1.18', '', SYSTEM)]
+builddependencies = [
+    ('popt', '1.18', '', SYSTEM),
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 
 dependencies = [
     # needed due to the inclusion of hwloc
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
index ee7bc0330996c6131499a1ab96f32ca079f74323..a52cdaed37023820d71bc3dc00ca3a39a6cbd8d0 100644
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -24,7 +24,11 @@ patches = [
     'psmpi_shebang.patch',
 ]
 
-builddependencies = [('popt', '1.18', '', SYSTEM)]
+builddependencies = [
+    ('popt', '1.18', '', SYSTEM),
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 
 dependencies = [
     # needed due to the inclusion of hwloc
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
index 1fc3c05b8563cdf7f056545e9eeb363cc608bcc7..0181104d8214923da0e231838a54ef453ddf675e 100644
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -23,7 +23,11 @@ patches = [
     'psmpi_shebang.patch',
 ]
 
-builddependencies = [('popt', '1.18', '', SYSTEM)]
+builddependencies = [
+    ('popt', '1.18', '', SYSTEM),
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 
 dependencies = [
     # needed due to the inclusion of hwloc