diff --git a/Custom_EasyBlocks/psmpi.py b/Custom_EasyBlocks/psmpi.py
index f9001ee72743f1d69ff3e053f9b1beec60d372cc..419364518739b864645bf158e3db669546142122 100644
--- a/Custom_EasyBlocks/psmpi.py
+++ b/Custom_EasyBlocks/psmpi.py
@@ -60,6 +60,7 @@ class EB_psmpi(EB_MPICH):
             'threaded': [False, "Enable multithreaded build (which is slower)", CUSTOM],
             'pscom_allin_path': [None, "Enable pscom integration by giving its source path", CUSTOM],
             'cuda': [False, "Enable CUDA awareness", CUSTOM],
+            'msa': [False, "Enable MSA awareness", CUSTOM],
         })
         return extra_vars
 
@@ -88,6 +89,10 @@ class EB_psmpi(EB_MPICH):
             self.log.info("Enabling CUDA-Awareness...")
             self.cfg.update('configopts', ' --with-cuda')
 
+        if self.cfg['msa']:
+            self.log.info("Enabling MSA-Awareness...")
+            self.cfg.update('configopts', ' --with-msa-awareness')
+
         # Set confset
         comp_fam = self.toolchain.comp_family()
         if comp_fam in comp_opts: