diff --git a/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs b/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
index 15fbdfaf57..10648204fb 100644
--- a/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
+++ b/src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
@@ -100,10 +100,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 				Debug.WriteLine("ActiveWorkbenchWindowChanged to " + workbench.ActiveWorkbenchWindow);
 				LoggingService.Debug("ActiveWorkbenchWindowChanged to " + workbench.ActiveWorkbenchWindow);
 			};
-			
-			System.Windows.Forms.Application.Idle += delegate {
-				LoggingService.Debug("Idle");
-			};
 		}
 		
 		/// <summary>
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index b05cfcef9b..58849fbf94 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -59,12 +59,12 @@
 			Installed OR (NETFRAMEWORK40FULL AND NETFRAMEWORK40FULLVERSION = "4.0.30128")
 		</Condition>
 		
-		<!--
-			Check for the operating system is at least Windows 2000 (VersionNT = 500). 
-			http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/operating_system_property_values.asp		
-		-->
-		<Condition Message="The operating system you are using is not supported by SharpDevelop (95/98/ME/NT3.x/NT4.x).">
-			Installed OR VersionNT &gt;= 500
+		<!-- Check for C++ 2008 Runtime (we accept any 2008 runtime version) -->
+		<Property Id="VCPP2008RUNTIME" Secure="yes">
+			<RegistrySearch Id="VCpp2008Runtime" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0" Name="SP" Type="raw" />
+		</Property>
+		<Condition Message="This setup requires the Microsoft Visual C++ 2008 SP1 Redistributable Package to be installed.">
+			Installed OR (VCPP2008RUNTIME &lt;&gt; "")
 		</Condition>
 		
 		<!--