diff --git a/agent/windows-setup-agent/SetupWizard.cs b/agent/windows-setup-agent/SetupWizard.cs
index f550853f9..771015cd5 100644
--- a/agent/windows-setup-agent/SetupWizard.cs
+++ b/agent/windows-setup-agent/SetupWizard.cs
@@ -269,6 +269,17 @@ namespace Icinga
 				return;
 			}
 
+			if (chkInstallNSCP.Checked)
+			{
+				SetConfigureStatus(85, "Waiting for NSClient++ installation to complete...");
+
+				Process proc = new Process();
+				proc.StartInfo.FileName = "msiexec.exe";
+				proc.StartInfo.Arguments = "/i \"" + Program.Icinga2InstallDir + "\\sbin\\NSCP-Win32.msi\"";
+				proc.Start();
+				proc.WaitForExit();
+			}
+
 			SetConfigureStatus(100, "Finished.");
 
 			FinishConfigure();