diff --git a/bin/setup/PostInstallTasks.bat b/bin/setup/PostInstallTasks.bat
index ec8c54957f..24a1f23756 100644
--- a/bin/setup/PostInstallTasks.bat
+++ b/bin/setup/PostInstallTasks.bat
@@ -10,7 +10,7 @@ echo.
 echo ICSharpCode.SharpZipLib.dll
 ..\tools\gacutil2.exe /i ..\ICSharpCode.SharpZipLib.dll
 echo.
-echo Installing and configuring help system
-cd help
-call register.bat
+rem echo Installing and configuring help system
+rem cd help
+rem call register.bat
 @IF %ERRORLEVEL% NEQ 0 PAUSE
\ No newline at end of file
diff --git a/bin/setup/PreUninstallTasks.bat b/bin/setup/PreUninstallTasks.bat
index a142785bd7..5c156d8110 100644
--- a/bin/setup/PreUninstallTasks.bat
+++ b/bin/setup/PreUninstallTasks.bat
@@ -6,6 +6,7 @@ echo.
 ..\tools\gacutil2.exe /u ..\nunit.framework.dll
 echo.
 ..\tools\gacutil2.exe /u ..\ICSharpCode.SharpZipLib.dll
-cd help
-call unregister.bat
+rem echo Uninstalling help system
+rem cd help
+rem call unregister.bat
 @IF %ERRORLEVEL% NEQ 0 PAUSE
\ No newline at end of file
diff --git a/src/Tools/Tools.build b/src/Tools/Tools.build
index 15e4fdac71..a4f5b66402 100644
--- a/src/Tools/Tools.build
+++ b/src/Tools/Tools.build
@@ -14,11 +14,13 @@
 		<Copy SourceFiles="@(WixCaFiles)" DestinationFolder="..\..\bin\Tools\Wix\ca"/>
 		<Copy SourceFiles="@(WixDocFiles)" DestinationFolder="..\..\bin\Tools\Wix\doc"/>
 		<Copy SourceFiles="@(WixLibFiles)" DestinationFolder="..\..\bin\Tools\Wix\lib"/>
+		<!--
 		<CreateProperty Condition = "!Exists('..\..\bin\setup\help\register.bat')" Value="yes">
 			<Output TaskParameter="Value" PropertyName="NeedToRunRegister" />
 		</CreateProperty>
 		<Copy SourceFiles="@(HelpToolFiles)" DestinationFolder="..\..\bin\setup\help"/>
 		<Exec Command="register.bat" WorkingDirectory = "..\..\bin\setup\help" Timeout = "60000" IgnoreExitCode = "true" Condition = "'$(NeedToRunRegister)' == 'yes'" />
+		-->
 	</Target>
 	
 	<Target Name="Rebuild" DependsOnTargets="Clean;Build"/>