diff --git a/docs/templates/bmake.txt b/docs/templates/bmake.txt
index cce39ca6..d5aa1fb6 100644
--- a/docs/templates/bmake.txt
+++ b/docs/templates/bmake.txt
@@ -22,6 +22,7 @@ exeflags = Linker flags that are required to create an executable.
 libflags = Flags that are required to create a static library.
 link = The name of the tool used to create dynamic libraries and executables.
 obj_ext = The extension given to object files.
+pdbl = If this boolean template variable is set, the Linker Debugging property "Generate Program Database File" will be set according to the project target.
 rc = The name of the resource compiler.
 rcdir = The list of directories to be searched when locating resource files. This is determined by the BMakeProjectCreator.
 startup_letter = The text used during the creation of the startup object file.
diff --git a/templates/bmake.mpd b/templates/bmake.mpd
index a51dbba9..1dbdad28 100644
--- a/templates/bmake.mpd
+++ b/templates/bmake.mpd
@@ -53,7 +53,7 @@ DEBUG_EXT = <%debug_ext%>
 <%foreach(configurations)%>
 !ifdef <%normalize(uc(configuration))%>
 OCFLAGS = <%if(optimize)%>$(OPTIMIZE_CFLAGS) <%else%><%if(debug_prj)%>$(DEBUG_CFLAGS)<%foreach(debug_macros)%> -D<%debug_macro%><%endfor%><%endif%><%endif%><%foreach(defines)%> -D<%define%><%endfor%><%if(!debug_prj)%> $(RELEASE_CFLAGS)<%endif%>
-LFLAGS =<%if(debug_prj)%> $(PDB_FLAGS)<%endif%>
+LFLAGS =<%if(pdbl)%> $(PDB_FLAGS)<%endif%>
 CFG_DIR = <%intermediate_dir%>\\
 LIBMODIFIER = <%if(use_lib_modifier)%><%lib_modifier%><%endif%>
 EXEMODIFIER = <%if(use_exe_modifier)%><%lib_modifier%><%endif%>
diff --git a/templates/bmakedll.mpt b/templates/bmakedll.mpt
index 287183ff..6b030462 100644
--- a/templates/bmakedll.mpt
+++ b/templates/bmakedll.mpt
@@ -9,6 +9,7 @@ Release {
   defines          = NDEBUG
   intermediate_dir = Release
   lib_modifier     = _br
+  pdbl             = 1
 }
 
 Debug {
@@ -17,6 +18,7 @@ Debug {
   defines          = _DEBUG
   intermediate_dir = Debug
   lib_modifier     = _bd
+  pdbl             = 1
 }
 
 Static Release {
@@ -26,6 +28,7 @@ Static Release {
   intermediate_dir = Static_Release
   lib_modifier     = _bsr
   type_is_static   = 1
+  pdbl             = 1
 }
 
 Static Debug {
@@ -36,6 +39,7 @@ Static Debug {
   intermediate_dir = Static_Debug
   lib_modifier     = _bsd
   type_is_static   = 1
+  pdbl             = 1
 }
 
 conditional_include "user_bmakedll"
diff --git a/templates/bmakedllexe.mpt b/templates/bmakedllexe.mpt
index b710049e..bcd1c14b 100644
--- a/templates/bmakedllexe.mpt
+++ b/templates/bmakedllexe.mpt
@@ -10,6 +10,7 @@ Release {
   output_dir       = Release
   intermediate_dir = Release
   lib_modifier     = _br
+  pdbl             = 1
 }
 
 Debug {
@@ -18,6 +19,7 @@ Debug {
   defines          = _DEBUG
   intermediate_dir = Debug
   lib_modifier     = _bd
+  pdbl             = 1
 }
 
 Static Release {
@@ -27,6 +29,7 @@ Static Release {
   intermediate_dir = Static_Release
   lib_modifier     = _bsr
   type_is_static   = 1
+  pdbl             = 1
 }
 
 Static Debug {
@@ -37,6 +40,7 @@ Static Debug {
   intermediate_dir = Static_Debug
   lib_modifier     = _bsd
   type_is_static   = 1
+  pdbl             = 1
 }
 
 conditional_include "user_bmakedllexe"
diff --git a/templates/bmakelib.mpt b/templates/bmakelib.mpt
index 7407e201..c33d4087 100644
--- a/templates/bmakelib.mpt
+++ b/templates/bmakelib.mpt
@@ -6,6 +6,7 @@ Release {
   defines          = NDEBUG
   intermediate_dir = Static_Release
   lib_modifier     = _bsr
+  pdbl             = 1
 }
 
 Debug {
@@ -14,6 +15,7 @@ Debug {
   defines          = _DEBUG
   intermediate_dir = Static_Debug
   lib_modifier     = _bsd
+  pdbl             = 1
 }
 
 conditional_include "user_bmakelib"
diff --git a/templates/bmakelibexe.mpt b/templates/bmakelibexe.mpt
index 495884d5..a113b4c2 100644
--- a/templates/bmakelibexe.mpt
+++ b/templates/bmakelibexe.mpt
@@ -9,6 +9,7 @@ Release {
   output_dir       = Static_Release
   intermediate_dir = Static_Release
   lib_modifier     = _bsr
+  pdbl             = 1
 }
 
 Debug {
@@ -18,6 +19,7 @@ Debug {
   output_dir       = Static_Debug
   intermediate_dir = Static_Debug
   lib_modifier     = _bsd
+  pdbl             = 1
 }
 
 conditional_include "user_bmakelibexe"