diff --git a/v1/msvc-tools.jam b/v1/msvc-tools.jam
index dbfb93c4d..4e7336bbf 100644
--- a/v1/msvc-tools.jam
+++ b/v1/msvc-tools.jam
@@ -128,6 +128,12 @@ rule vc-set-pdb-file ( targets + : name )
 rule Link-action ( target implib ? : sources + : target-type ? )
 {
     with-command-file vc-Link $(<) : $(sources) $(NEEDLIBS) ;
+    
+    if $(target-type) != LIB
+    {
+        MANIFEST on $(target) = $(VC_MANIFEST) ;
+        OUTPUTRESOURCE on $(target) = $(VC_OUTPUTRESOURCE) ;
+    }
 
     gRUN_PATH($(<)) += $(VC_STDLIB_PATH) ;
     if $(implib)
@@ -143,10 +149,14 @@ rule Link-action ( target implib ? : sources + : target-type ? )
     vc-set-pdb-file $(<) : $(target:B) ;
 }
 
+VC_MANIFEST = ;
+VC_OUTPUTRESOURCE = ;
+
 actions together vc-Link
 {
     $(VC_SETUP)
     "$(VC_TOOL_PATH)$(VC_LINKER)" /nologo $(NOINCREMENTAL) $(LINKFLAGS) $(PDB_LINKFLAG)"$(VC_PDB_FILE)" /out:"$(<[1])" /IMPLIB:"$(<[2])" /LIBPATH:"$(LIBPATH)" /LIBPATH:"$(STDLIBPATH)" "$(FINDLIBS:S=.lib)" @"$(>)"
+    $(MANIFEST)$(<[1]).manifest $(OUTPUTRESOURCE)$(<[1]);#2
 }
 
 #### Cc #####
diff --git a/v1/vc-8_0-tools.jam b/v1/vc-8_0-tools.jam
index ccd212ec7..f753bb720 100644
--- a/v1/vc-8_0-tools.jam
+++ b/v1/vc-8_0-tools.jam
@@ -17,10 +17,12 @@ if ! $(MSVCDir)
         VC80_ROOT ?= $(ProgramFiles:J=" ")"\\Microsoft Visual Studio 8\\VC" ;
         VC_TOOL_PATH = "$(VC80_ROOT)"\\bin\\ ;
         VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
-    }
+    }    
 }
 
 VC_PDB_NAME = vc80 ;
+VC_MANIFEST = "mt -manifest " ;
+VC_OUTPUTRESOURCE = -outputresource: ;
 
 feature native-wchar_t : on off ;