diff --git a/templates/vc10.mpd b/templates/vc10.mpd
index 7c4358c2e..ffdf124d6 100644
--- a/templates/vc10.mpd
+++ b/templates/vc10.mpd
@@ -24,16 +24,18 @@
     <Keyword>ManagedCProj</Keyword>
     <TargetFrameworkVersion>v<%TargetFrameworkVersion("4.0")%></TargetFrameworkVersion>
 <%else%>
-    <Keyword><%if(UseOfMFC)%>MFCProj<%else%><%platform("Win32")%>Proj<%endif%></Keyword>
+    <%if(activex)%><Keyword>MFCActiveXProj</Keyword><%else%><Keyword><%if(UseOfMFC)%>MFCProj<%else%><%platform("Win32")%>Proj<%endif%></Keyword><%endif%>
 <%endif%>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 <%foreach(platforms)%>
 <%foreach(configurations)%>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'" Label="Configuration">
-    <ConfigurationType><%if(type_is_dynamic)%>DynamicLibrary<%else%><%if(type_is_static && staticname)%>StaticLibrary<%else%><%if(custom_only)%>Utility<%else%><%if(makeoutput)%>Makefile<%else%>Application<%endif%><%endif%><%endif%><%endif%></ConfigurationType>
+    <ConfigurationType><%if(type_is_static && staticname)%>StaticLibrary<%else%><%if(type_is_dynamic)%>DynamicLibrary<%else%><%if(custom_only)%>Utility<%else%><%if(makeoutput)%>Makefile<%else%>Application<%endif%><%endif%><%endif%><%endif%></ConfigurationType>
 <%if(UseOfMFC)%>
-    <UseOfMfc><%UseOfMFC%></UseOfMfc>
+    <UseOfMfc><%if(compares(UseOfMFC,1))%>Static<%else%><%if(compares(UseOfMFC,2))%>Dynamic<%endif%><%endif%></UseOfMfc>
+<%else%>
+    <UseOfMfc>false</UseOfMfc>
 <%endif%>
 <%if(UseOfATL)%>
     <UseOfAtl><%UseOfATL%></UseOfAtl>
@@ -105,8 +107,12 @@
 <%else%>
 <%if(!type_is_static)%>
 <%if(exename || sharedname || staticname)%>
-<%if(type_is_dynamic && !compares(dll_ext, .dll))%>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%dll_ext%></TargetExt>
+<%if(type_is_dynamic && (!compares(dll_ext, .dll) || activex))%>
+<%if(activex)%>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'">.ocx</TargetExt>
+<%else%>
+    <%if(!compares(dll_ext, .dll))%><TargetExt Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%dll_ext%></TargetExt><%endif%>
+<%endif%>
 <%else%>
 <%if(!type_is_dynamic && !compares(exe_ext, .exe))%>
     <TargetExt Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%exe_ext%></TargetExt>
@@ -139,21 +145,7 @@
       <Command><%eval(prebuild)%></Command>
     </PreBuildEvent>
 <%endif%>
-    <Midl>
-      <PreprocessorDefinitions><%foreach(midl_defines)%><%midl_define%>;<%endfor%>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories><%foreach(midl_includes)%><%midl_include%>;<%endfor%>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TargetEnvironment><%platform%></TargetEnvironment>
-<%if(midl_notlb)%>
-      <GenerateStublessProxies>false</GenerateStublessProxies>
-<%endif%>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-<%if(midl_flags)%>
-      <AdditionalOptions><%midl_flags%></AdditionalOptions>
-<%endif%>
-    </Midl>
+
     <ClCompile>
       <Optimization><%optimize("Disabled")%></Optimization>
 <%if(InlineFunctionExpansion)%>
@@ -199,7 +191,12 @@
 <%if(SmallerTypeCheck)%>
       <SmallerTypeCheck>true</SmallerTypeCheck>
 <%endif%>
+
+<%if(runtime_library)%>
+      <RuntimeLibrary><%if(compares(runtime_library,0))%>MultiThreaded<%else%><%if(compares(runtime_library,1))%>MultiThreadedDebug<%else%><%if(compares(runtime_library,2))%>MultiThreadedDLL<%else%><%if(compares(runtime_library,3))%>MultiThreadedDebugDLL<%endif%><%endif%><%endif%><%endif%></RuntimeLibrary>
+<%else%>
       <RuntimeLibrary><%if(runtime_library)%><%runtime_library%><%else%><%if(type_is_static || need_staticflags)%><%if(debug_prj)%>MultiThreadedDebug<%else%>MultiThreaded<%endif%><%else%><%if(debug_prj)%>MultiThreadedDebugDLL<%else%>MultiThreadedDLL<%endif%><%endif%><%endif%></RuntimeLibrary>
+<%endif%>
 <%if(StructMemberAlignment)%>
       <StructMemberAlignment><%StructMemberAlignment%></StructMemberAlignment>
 <%endif%>
@@ -262,7 +259,8 @@
       <ObjectFileName><%ObjectFileName%></ObjectFileName>
 <%endif%>
 <%if(pdbc)%>
-      <ProgramDataBaseFileName><%if(type_is_static)%><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%><%intermediate_dir%>\<%noextension(project_file)%><%if(output_subdir)%>\<%output_subdir%><%endif%>\<%endif%></ProgramDataBaseFileName>
+      <OutputFile><%if(lib_full)%><%lib_full%><%lib_ext%><%else%><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%><%endif%></OutputFile>
+      <ProgramDataBaseFileName><%if(lib_full)%><%lib_full%>.pdb<%else%><%if(type_is_static)%><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%><%intermediate_dir%>\<%noextension(project_file)%><%if(output_subdir)%>\<%output_subdir%><%endif%>\<%endif%><%endif%></ProgramDataBaseFileName>
 <%else%>
 <%if(ProgramDataBaseFileName)%>
       <ProgramDataBaseFileName><%ProgramDataBaseFileName%></ProgramDataBaseFileName>
@@ -282,7 +280,7 @@
 <%endif%>
       <WarningLevel><%if(compares(warning_level, all))%>EnableAllWarnings<%else%><%if(compares(warning_level, none) || compares(warning_level, 0))%>TurnOffAllWarnings<%else%>Level<%warning_level("3")%><%endif%><%endif%></WarningLevel>
 <%if(!managed && debug_format)%>
-      <DebugInformationFormat><%debug_format%></DebugInformationFormat>
+      <DebugInformationFormat><%if(compares(debug_format, 0))%>None<%else%><%if(compares(debug_format, 1))%>OldStyle<%else%><%if(compares(debug_format, 2))%>ProgramDatabase<%else%><%if(compares(debug_format, 3))%>EditAndContinue<%endif%><%endif%><%endif%><%endif%></DebugInformationFormat>
 <%endif%>
 <%if(CallingConvention)%>
       <CallingConvention><%CallingConvention%></CallingConvention>
@@ -334,6 +332,9 @@
 <%endif%>
 <%if(compile_flags)%>
       <AdditionalOptions><%compile_flags%> %(AdditionalOptions)</AdditionalOptions>
+<%endif%>
+<%if(activex)%>
+      <SDLCheck>true</SDLCheck>
 <%endif%>
     </ClCompile>
     <ResourceCompile>
@@ -349,9 +350,9 @@
 <%if(type_is_static)%>
     <Lib>
 <%if(staticname)%>
-      <OutputFile><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%></OutputFile>
+      <OutputFile><%if(lib_full)%><%lib_full%><%lib_ext%><%else%><%libout%>\<%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%><%endif%></OutputFile>
 <%endif%>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies><%foreach(reverse(libs))%><%fornotfirst(";")%><%libname_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%><%endfor%><%foreach(reverse(lit_libs))%>;<%lit_lib%>.lib<%endfor%><%foreach(reverse(pure_libs))%> <%pure_lib%><%endfor%>;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories><%foreach(libpaths)%><%libpath%>;<%endfor%>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 <%if(SuppressStartupBanner)%>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -415,9 +416,10 @@
 <%if(GenerateDebugInformation)%>
       <GenerateDebugInformation><%GenerateDebugInformation%></GenerateDebugInformation>
 <%endif%>
-      <AdditionalDependencies><%foreach(reverse(libs))%><%libname_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>;<%endfor%><%foreach(reverse(lit_libs))%><%lit_lib%>.lib;<%endfor%><%foreach(reverse(pure_libs))%> <%pure_lib%>;<%endfor%>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies><%foreach(reverse(libs))%><%fornotfirst(";")%><%libname_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%><%endfor%><%foreach(reverse(lit_libs))%>;<%lit_lib%>.lib<%endfor%><%foreach(reverse(pure_libs))%> <%pure_lib%><%endfor%>;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories><%foreach(libpaths)%><%libpath%>;<%endfor%>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 <%if(exename || sharedname || staticname)%>
-      <OutputFile>$(OutDir)<%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%else%><%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%></OutputFile>
+      <OutputFile>$(OutDir)<%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%if(activex)%>.ocx<%else%><%dll_ext%><%endif%><%else%><%exename%><%if(use_exe_modifier)%><%exe_modifier%><%endif%><%exe_ext%><%endif%></OutputFile>
 <%endif%>
 <%if(ShowProgress)%>
       <ShowProgress><%ShowProgress%></ShowProgress>
@@ -626,7 +628,7 @@
       <ImportLibrary><%ImportLibrary%></ImportLibrary>
 <%else%>
 <%if(type_is_dynamic && sharedname)%>
-      <ImportLibrary><%libout%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%></ImportLibrary>
+      <ImportLibrary><%if(lib_full)%><%lib_full%><%lib_ext%><%else%><%libout%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%><%endif%></ImportLibrary>
 <%endif%>
 <%endif%>
 <%if(MergeSections)%>
@@ -682,6 +684,26 @@
 <%endif%>
     </Link>
 <%endif%>
+<%if(activex)%>
+    <Midl>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <ValidateAllParameters>true</ValidateAllParameters>
+      <PreprocessorDefinitions><%foreach(midl_defines)%><%midl_define%>;<%endfor%>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>$(IntDir)\<%project_name%>.tlb</TypeLibraryName>
+      <HeaderFileName>$(ProjectName)idl.h</HeaderFileName>
+    </Midl>
+<%endif%>
+    <ResourceCompile>
+      <PreprocessorDefinitions><%if(unicode)%>UNICODE;_UNICODE;<%endif%><%foreach(defines macros platform_defines)%><%define%>;<%endfor%>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture><%culture("1033")%></Culture>
+<%if(activex)%>
+      <AdditionalIncludeDirectories>$(IntDir);<%foreach(includes)%><%include%>;<%endfor%>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+<%else%>
+      <AdditionalIncludeDirectories><%foreach(includes)%><%include%>;<%endfor%>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+<%endif%>
+    </ResourceCompile>
+
+
 <%if(postbuild)%>
     <PostBuildEvent>
       <Command><%eval(postbuild)%></Command>
@@ -708,6 +730,21 @@
   </ItemDefinitionGroup>
 <%endfor%>
 <%endfor%>
+
+<!-- SUPPORT FOR OCX -->
+<%if(activex)%>
+    <ItemGroup>
+      <Midl Include="<%project_name%>.idl" />
+    </ItemGroup>
+    <ItemGroup>
+      <Image Include="<%project_name%>.ico" />
+      <Image Include="<%project_name%>Ctrl.bmp" />
+    </ItemGroup>
+    <ItemGroup>
+      <None Include="<%project_name%>.def" />
+    </ItemGroup>
+<%endif%>
+
   <ItemGroup>
 <%if(after && add_references)%>
     <!-- MPC ADD DEPENDENCIES -->
@@ -801,6 +838,9 @@
 <%endif%>
 <%if(header_files)%>
   <ItemGroup>
+  <%if(pch_header)%> 
+    <ClInclude Include="<%pch_header%>" />
+  <%endif%>
 <%foreach(uniq(header_files))%>
 <%if(!is_custom_input(header_file))%>
     <ClInclude Include="<%header_file%>" />
@@ -820,7 +860,7 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'">Invoking "<%if(custom_type->input_file->commands)%><%foreach(custom_type->input_file->commands)%><%custom_type->input_file->command%><%fornotlast(" and ")%><%endfor%><%else%><%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%><%endif%> on <%custom_type->input_file%>"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(";")%><%endfor%></Outputs>
 <%if(flag_overrides(custom_type->input_file, dependent) || custom_type->dependent || custom_type->input_file->dependencies || (!need_staticflags && (flag_overrides(custom_type->input_file, dependent_libs) || custom_type->dependent_libs)))%>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(flag_overrides(custom_type->input_file, dependent))%><%foreach(dep, flag_overrides(custom_type->input_file, dependent))%><%dep%><%if(!has_extension(dep))%><%exe_ext%><%endif%><%fornotlast(";")%><%endfor%><%else%><%if(custom_type->dependent)%><%foreach(custom_type->dependent)%><%custom_type->dependent%><%if(!has_extension(custom_type->dependent))%><%exe_ext%><%endif%><%fornotlast(";")%><%endfor%><%endif%><%endif%><%foreach(custom_type->input_file->dependencies)%><%if(flag_overrides(custom_type->input_file, dependent) || custom_type->dependent)%>;<%else%><%fornotfirst(";")%><%endif%><%custom_type->input_file->dependencie%><%endfor%><%if(!need_staticflags)%><%if(flag_overrides(custom_type->input_file, dependent_libs))%><%foreach(dep_lib, flag_overrides(custom_type->input_file, dependent_libs))%><%if(flag_overrides(custom_type->input_file, dependent) || custom_type->dependent || custom_type->input_file->dependencies)%>;<%else%><%fornotfirst(";")%><%endif%><%dirname(dep_lib)%>\<%libname_prefix%><%basename(dep_lib)%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%endfor%><%else%><%if(custom_type->dependent_libs)%><%foreach(custom_type->dependent_libs)%><%if(flag_overrides(custom_type->input_file, dependent) || custom_type->dependent || custom_type->input_file->dependencies)%>;<%else%><%fornotfirst(";")%><%endif%><%dirname(custom_type->dependent_lib)%>\<%libname_prefix%><%basename(custom_type->dependent_lib)%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%endfor%><%endif%><%endif%><%endif%></AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%if(flag_overrides(custom_type->input_file, dependent))%><%foreach(dep, flag_overrides(custom_type->input_file, dependent))%><%dep%><%if(!has_extension(dep))%><%exe_ext%><%endif%><%fornotlast(";")%><%endfor%><%else%><%if(custom_type->dependent)%><%foreach(custom_type->dependent)%><%custom_type->dependent%><%if(!has_extension(custom_type->dependent))%><%exe_ext%><%endif%><%fornotlast(";")%><%endfor%><%endif%><%endif%><%foreach(custom_type->input_file->dependencies)%><%if(flag_overrides(custom_type->input_file, dependent) || custom_type->dependent)%>;<%else%><%fornotfirst(";")%><%endif%><%custom_type->input_file->dependencie%><%endfor%><%if(!need_staticflags)%><%if(flag_overrides(custom_type->input_file, dependent_libs))%><%foreach(dep_lib, flag_overrides(custom_type->input_file, dependent_libs))%><%if(flag_overrides(custom_type->input_file, dependent) || custom_type->dependent || custom_type->input_file->dependencies)%>;<%else%><%fornotfirst(";")%><%endif%><%dirname(dep_lib)%>\<%libname_prefix%><%basename(dep_lib)%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%if(activex)%>.ocx<%else%><%dll_ext%><%endif%><%endfor%><%else%><%if(custom_type->dependent_libs)%><%foreach(custom_type->dependent_libs)%><%if(flag_overrides(custom_type->input_file, dependent) || custom_type->dependent || custom_type->input_file->dependencies)%>;<%else%><%fornotfirst(";")%><%endif%><%dirname(custom_type->dependent_lib)%>\<%libname_prefix%><%basename(custom_type->dependent_lib)%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%if(activex)%>.ocx<%else%><%dll_ext%><%endif%><%endfor%><%endif%><%endif%><%endif%></AdditionalInputs>
 <%endif%>
 <%endfor%>
 <%endfor%>
diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index a7ad5263b..a30c32569 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -5,7 +5,7 @@
 	Name="<%project_name%>"
 	ProjectGUID="{<%guid%>}"
 	RootNamespace="<%project_name%>"
-	Keyword="<%if(UseOfMFC)%>MFCProj<%else%><%platform("Win32")%>Proj<%endif%>"
+	Keyword="<%if(UseOfMFC)%><%if(activex)%>MFCActiveXProj<%else%>MFCProj<%endif%><%else%><%platform("Win32")%>Proj<%endif%>"
 	SignManifests="true"
 	>
 	<Platforms>
@@ -80,10 +80,17 @@
 <%if(midl_notlb)%>
 				GenerateTypeLibrary="false"
 <%endif%>
+<%if(activex)%>
+				MkTypLibCompatible="false"
+				TypeLibraryName="$(IntDir)/$(InputName).tlb"
+				HeaderFileName="$(ProjectName)idl.h"
+				ValidateParameters="true"
+<%else%>
 				TypeLibraryName="$(InputName).tlb"
 				HeaderFileName="$(InputName).h"
 				InterfaceIdentifierFileName="$(InputName)_i.c"
 				ProxyFileName="$(InputName)_p.c"
+<%endif%>
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -278,7 +285,11 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="<%if(unicode)%>UNICODE;_UNICODE;<%endif%><%foreach(defines macros platform_defines)%><%define%><%fornotlast(";")%><%endfor%>"
 				Culture="<%culture("1033")%>"
+<%if(activex)%>
+				AdditionalIncludeDirectories="$(IntDir)<%foreach(includes)%><%fornotlast(",")%><%include%><%endfor%>"
+<%else%>
 				AdditionalIncludeDirectories="<%foreach(includes)%><%include%><%fornotlast(",")%><%endfor%>"
+<%endif%>
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -298,7 +309,7 @@
 <%else%>
 				Name="VCLinkerTool"
 <%if(RegisterOutput)%>
-				RegisterOutput="<%RegisterOutput%>"
+				RegisterOutput="<%if(compares(RegisterOutput,1))%>true<%else%>false<%endif%>"
 <%endif%>
 <%if(IgnoreImportLibrary)%>
 				IgnoreImportLibrary="<%IgnoreImportLibrary%>"
@@ -323,7 +334,7 @@
 				AdditionalDependencies="<%foreach(reverse(libs))%><%fornotfirst(" ")%><%libname_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%><%endfor%><%foreach(reverse(lit_libs))%> <%lit_lib%>.lib<%endfor%><%foreach(reverse(pure_libs))%> <%pure_lib%><%endfor%>"
 <%endif%>
 <%if(exename || sharedname || staticname)%>
-				OutputFile="$(OutDir)\<%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%><%else%><%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%><%endif%>"
+				OutputFile="$(OutDir)\<%if(type_is_dynamic)%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%if(activex)%>.ocx<%else%><%dll_ext%><%endif%><%else%><%exename%><%if(use_exe_modifier)%><%exe_modifier%><%endif%><%exe_ext%><%endif%>"
 <%endif%>
 <%if(win_version)%>
 				Version="<%win_version%>"
@@ -537,7 +548,7 @@
 			<DeploymentTool
 				ForceDirty="-1"
 				RemoteDirectory="<%deployment_directory%>"
-				RegisterOutput="0"
+				RegisterOutput="false"
 				AdditionalFiles=""
 			/>
 <%endif%>