diff --git a/IronPython.sln b/IronPython.sln
index 78a60c885..015b418ef 100644
--- a/IronPython.sln
+++ b/IronPython.sln
@@ -101,6 +101,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF0
 		Package\msi\Version.wxi = Package\msi\Version.wxi
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPythonWindow32", "Src\IronPythonWindow32\IronPythonWindow32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -163,6 +165,10 @@ Global
 		{DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F177DC2-9822-45BD-AB05-1F40FCA86168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F177DC2-9822-45BD-AB05-1F40FCA86168}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F177DC2-9822-45BD-AB05-1F40FCA86168}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F177DC2-9822-45BD-AB05-1F40FCA86168}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Package/msi/IronPython.wxs b/Package/msi/IronPython.wxs
index 6806c7e1b..508f967c2 100644
--- a/Package/msi/IronPython.wxs
+++ b/Package/msi/IronPython.wxs
@@ -16,6 +16,9 @@
         <File Id="ipy.exe" KeyPath="yes" Source="$(var.PlatformDir)\ipy.exe">
           <netfx:NativeImage Id="ngen_ipy.exe" Platform="all" AppBaseDirectory="INSTALLDIR"/>
         </File>
+        <File Id="ipy32.exe" Source="$(var.PlatformDir)\ipy32.exe">
+          <netfx:NativeImage Id="ngen_ipy32.exe" Platform="all" AppBaseDirectory="INSTALLDIR"/>
+        </File>
       </Component>
 
       <Component Guid="{F7E1626D-3007-405D-A656-1A971D172A07}">
@@ -29,6 +32,9 @@
         <File Id="ipyw.exe" KeyPath="yes" Source="$(var.PlatformDir)\ipyw.exe">
           <netfx:NativeImage Id="ngen_ipyw.exe" Platform="all" AppBaseDirectory="INSTALLDIR"/>
         </File>
+        <File Id="ipyw32.exe" Source="$(var.PlatformDir)\ipyw32.exe">
+          <netfx:NativeImage Id="ngen_ipyw32.exe" Platform="all" AppBaseDirectory="INSTALLDIR"/>
+        </File>
       </Component>
 
       <Directory Id="IronPython_DLLs" Name="DLLs">
diff --git a/Src/IronPythonWindow/ipy.ico b/Src/IronPythonWindow/ipy.ico
deleted file mode 100644
index 6602a5156..000000000
Binary files a/Src/IronPythonWindow/ipy.ico and /dev/null differ
diff --git a/Src/IronPythonWindow32/IronPythonWindow32.csproj b/Src/IronPythonWindow32/IronPythonWindow32.csproj
new file mode 100644
index 000000000..da4e8448e
--- /dev/null
+++ b/Src/IronPythonWindow32/IronPythonWindow32.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net46</TargetFrameworks>
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>IronPythonWindow</RootNamespace>
+    <AssemblyName>ipyw32</AssemblyName>
+    <ApplicationIcon>..\IronPythonWindow\ipyw.ico</ApplicationIcon>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\IronPython\IronPython.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\IronPythonWindow\Properties\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\IronPythonWindow\IronPythonWindow.cs" Link="IronPythonWindow.cs" />
+  </ItemGroup>
+
+  <Import Project="$(AfterTargetFiles)" />
+  <Target Name="AfterBuildEnds" AfterTargets="AfterBuild" DependsOnTargets="$(AfterTargets)" />
+
+</Project>