diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp
index 953850c75a..0b004984a1 100644
--- a/dtool/pptempl/Template.gmsvc.pp
+++ b/dtool/pptempl/Template.gmsvc.pp
@@ -422,14 +422,21 @@ $[TAB] rm -f $[sort $[installed_files]]
 $[install_lib_dir]/$[get_dllname $[TARGET]].$[dlllib] : $[ODIR]/$[get_dllname $[TARGET]].$[dlllib]
 #define local $[get_dllname $[TARGET]].$[dlllib]
 #define dest $[install_lib_dir]
-$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
+#if $[eq $[USE_COMPILER], MSVC8]
+$[TAB] mt -manifest $[ODIR]/$[local].manifest -outputresource:$[ODIR]/$[local]\;2
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local].manifest $[dest]
 #endif
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
+
+#endif
+
 
 $[install_lib_dir]/$[get_dllname $[TARGET]].lib : $[ODIR]/$[get_dllname $[TARGET]].lib
 #define local $[get_dllname $[TARGET]].lib
 #define dest $[install_lib_dir]
 $[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
 
+
 #if $[and $[build_dlls],$[build_pdbs]]
 $[install_lib_dir]/$[get_dllname $[TARGET]].pdb : $[ODIR]/$[get_dllname $[TARGET]].pdb
 #define local $[get_dllname $[TARGET]].pdb
@@ -678,6 +685,7 @@ $[ODIR]/$[TARGET].pdb : $[ODIR]/$[TARGET].exe
 #define installed_files \
     $[install_bin_dir]/$[TARGET].exe \
     $[if $[build_pdbs],$[install_bin_dir]/$[TARGET].pdb] \
+    $[if $[eq $[USE_COMPILER],MSVC8],$[install_bin_dir]/$[TARGET].exe.manifest] \
     $[INSTALL_SCRIPTS:%=$[install_bin_dir]/%] \
     $[INSTALL_HEADERS:%=$[install_headers_dir]/%] \
     $[INSTALL_DATA:%=$[install_data_dir]/%] \
@@ -686,6 +694,7 @@ $[ODIR]/$[TARGET].pdb : $[ODIR]/$[TARGET].exe
 
 install-$[TARGET] : $[installed_files]
 
+
 uninstall-$[TARGET] :
 #if $[installed_files]
 $[TAB] rm -f $[sort $[installed_files]]
@@ -695,6 +704,9 @@ $[install_bin_dir]/$[TARGET].exe : $[ODIR]/$[TARGET].exe
 #define local $[TARGET].exe
 #define dest $[install_bin_dir]
 $[TAB] cp $[install_dash_p] -f $[ODIR]/$[local] $[dest]/
+#if $[eq $[USE_COMPILER],MSVC8]
+$[TAB] cp $[install_dash_p] -f $[ODIR]/$[local].manifest $[dest]/
+#endif
 
 #if $[build_pdbs]
 $[install_bin_dir]/$[TARGET].pdb : $[ODIR]/$[TARGET].pdb
diff --git a/dtool/pptempl/compilerSettings.pp b/dtool/pptempl/compilerSettings.pp
index 8197dbee00..f4b85004db 100644
--- a/dtool/pptempl/compilerSettings.pp
+++ b/dtool/pptempl/compilerSettings.pp
@@ -47,7 +47,7 @@
   // ensure pdbs are copied to install dir
   #define build_pdbs yes
 
-#elif $[or $[eq $[USE_COMPILER], MSVC7], $[eq $[USE_COMPILER], MSVC7_1]]
+#elif $[or $[or $[eq $[USE_COMPILER], MSVC7], $[eq $[USE_COMPILER], MSVC7_1]], &[eq $[USE_COMPILER],MSVC8]]
 
   #define COMPILER cl
   #define LINKER link
@@ -117,7 +117,11 @@
   #define LINKER_FLAGS /DEBUG $[PROFILE_FLAG] /MAP $[MAPINFOFLAGS] /fixed:no /incremental:no /stack:4194304
 
   // Added to avoid old iostream reference problems
-  #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB
+  #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB 
+  // Added to make pandatool function in VS 8
+  #if $[eq $[USE_COMPILER],MSVC8]
+    #define LINKER_FLAGS $[LINKER_FLAGS] /NOD:MFC80.LIB /NOD:libcmtd /NOD:libc
+  #endif
 //  #define LINKER_FLAGS $[LINKER_FLAGS] /NODEFAULTLIB:LIBCI.LIB /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcprt.lib
 
 // in case we have mixed intel/msvc build