diff --git a/easyblocks/p/pgi.py b/easyblocks/p/pgi.py
index e2c2ea53e9ca0ba13da1818d04c6f135ca9168ae..24c52808d2145c68e7b9427e4071b17a8709936c 100644
--- a/easyblocks/p/pgi.py
+++ b/easyblocks/p/pgi.py
@@ -85,6 +85,8 @@ class EB_PGI(PackedBinary):
             'install_java': [True, "Install Java JRE for graphical debugger",  CUSTOM],
             'install_managed': [True, "Install OpenACC Unified Memory Evaluation package", CUSTOM],
             'install_nvidia': [True, "Install CUDA Toolkit Components", CUSTOM],
+            'install_mpi': [True, "Install MPI Components", CUSTOM],
+            'install_mpi_gpu': [True, "Install mpi_gpu support", CUSTOM],
         }
         return PackedBinary.extra_options(extra_vars)
 
@@ -131,9 +133,13 @@ class EB_PGI(PackedBinary):
             'PGI_INSTALL_DIR': self.installdir,
             'PGI_INSTALL_JAVA': str(self.cfg['install_java']).lower(),
             'PGI_INSTALL_MANAGED': str(self.cfg['install_managed']).lower(),
-            'PGI_INSTALL_NVIDIA': 'true',
-            'PGI_INSTALL_MPI': 'true',
+            'PGI_INSTALL_NVIDIA': str(self.cfg['install_nvidia']).lower(),
+            'PGI_INSTALL_MPI': str(self.cfg['install_mpi']).lower(),
+            'PGI_MPI_GPU_SUPPORT': str(self.cfg['install_mpi_gpu']).lower(),
+            #'PGI_INSTALL_NVIDIA': 'true',
+            #'PGI_INSTALL_MPI': 'true',
             'PGI_SILENT': 'true',
+            #'PGI_MPI_GPU_SUPPORT': 'true',
             }
         cmd = "%s ./install" % ' '.join(['%s=%s' % x for x in sorted(pgi_env_vars.items())])
         run_cmd(cmd, log_all=True, simple=True)