diff --git a/src/tools/pgi.jam b/src/tools/pgi.jam
index ca220235e..752dc5539 100644
--- a/src/tools/pgi.jam
+++ b/src/tools/pgi.jam
@@ -58,7 +58,7 @@ generators.register-fortran-compiler pgi.compile.fortran : FORTRAN : OBJ : <tool
 # Declare flags and actions for compilation
 flags pgi.compile OPTIONS : -Kieee ;
 flags pgi.compile OPTIONS <link>shared : -fpic ;
-flags pgi.compile OPTIONS <debug-symbols>on : -g ;
+flags pgi.compile OPTIONS <debug-symbols>on : -gopt ;
 flags pgi.compile OPTIONS <profiling>on : -xprofile=tcov ;
 flags pgi.compile OPTIONS <optimization>speed : -fast -Mx,8,0x10000000 ;
 flags pgi.compile OPTIONS <optimization>space : -xO2 -xspace ;
@@ -92,7 +92,7 @@ actions compile.fortran
 }
 
 # Declare flags and actions for linking
-flags pgi.link OPTIONS <debug-symbols>on : -g ;
+flags pgi.link OPTIONS <debug-symbols>on : -gopt ;
 # Strip the binary when no debugging is needed
 flags pgi.link OPTIONS <debug-symbols>off : -s ;
 flags pgi.link OPTIONS <profiling>on : -xprofile=tcov ;