diff --git a/configuration/scripts/machines/Macros.conrad_pgi b/configuration/scripts/machines/Macros.conrad_pgi
index 702c84a8d..be6fb1ef2 100644
--- a/configuration/scripts/machines/Macros.conrad_pgi
+++ b/configuration/scripts/machines/Macros.conrad_pgi
@@ -14,7 +14,7 @@ FFLAGS_NOOPT:= -O0
 ifeq ($(ICE_BLDDEBUG), true)
   FFLAGS     += -O0 -g -Mbounds -Mchkptr
 else
-  FFLAGS     += -O2
+  FFLAGS     += -O -g
 endif
 
 ifeq ($(ICE_COMMDIR), mpi)
diff --git a/configuration/scripts/machines/Macros.gordon_pgi b/configuration/scripts/machines/Macros.gordon_pgi
index ea0c4ee58..1403cf13a 100644
--- a/configuration/scripts/machines/Macros.gordon_pgi
+++ b/configuration/scripts/machines/Macros.gordon_pgi
@@ -14,7 +14,7 @@ FFLAGS_NOOPT:= -O0
 ifeq ($(ICE_BLDDEBUG), true)
   FFLAGS     += -O0 -g -Mbounds -Mchkptr
 else
-  FFLAGS     += -O2
+  FFLAGS     += -O -g
 endif
 
 ifeq ($(ICE_COMMDIR), mpi)