diff --git a/src/develop.rs b/src/develop.rs
index c48cca951..ae9a4e3b1 100644
--- a/src/develop.rs
+++ b/src/develop.rs
@@ -9,12 +9,24 @@ use anyhow::{anyhow, bail, format_err, Context, Result};
 use fs_err as fs;
 #[cfg(not(target_os = "windows"))]
 use std::fs::OpenOptions;
+#[cfg(target_os = "windows")]
+use std::io::Cursor;
 use std::io::Write;
 #[cfg(not(target_os = "windows"))]
 use std::os::unix::fs::OpenOptionsExt;
 use std::path::Path;
 use std::process::Command;
 
+// Windows launcher comes from https://bitbucket.org/vinay.sajip/simple_launcher/
+#[cfg(target_os = "windows")]
+static WIN_LAUNCHER_T32: &[u8] = include_bytes!("resources/t32.exe");
+#[cfg(target_os = "windows")]
+static WIN_LAUNCHER_T64: &[u8] = include_bytes!("resources/t64.exe");
+#[cfg(target_os = "windows")]
+static WIN_LAUNCHER_W32: &[u8] = include_bytes!("resources/w32.exe");
+#[cfg(target_os = "windows")]
+static WIN_LAUNCHER_W64: &[u8] = include_bytes!("resources/w64.exe");
+
 /// Installs a crate by compiling it and copying the shared library to site-packages.
 /// Also adds the dist-info directory to make sure pip and other tools detect the library
 ///
@@ -239,12 +251,26 @@ fn get_shebang(executable: &Path) -> String {
     }
 }
 
+#[cfg(target_os = "windows")]
+fn get_launcher(interpreter: &PythonInterpreter, gui: bool) -> Result<&[u8]> {
+    let code = "import sysconfig; print(sysconfig.get_config_var('SIZEOF_VOID_P'))";
+    let pointer_size = interpreter.run_script(code)?;
+    let launcher = match (pointer_size.trim(), gui) {
+        ("8", true) => WIN_LAUNCHER_W64,
+        ("4", true) => WIN_LAUNCHER_W32,
+        ("8", false) => WIN_LAUNCHER_T64,
+        ("4", false) => WIN_LAUNCHER_T32,
+        (_, _) => bail!("invalid python interpreter"),
+    };
+    Ok(launcher)
+}
+
 fn write_entry_points(interpreter: &PythonInterpreter, metadata21: &Metadata21) -> Result<()> {
     let code = "import sysconfig; print(sysconfig.get_path('scripts'))";
     let script_dir = interpreter.run_script(code)?;
     let script_dir = Path::new(script_dir.trim());
     let shebang = get_shebang(&interpreter.executable);
-    for (name, entry, gui) in metadata21
+    for (name, entry, _gui) in metadata21
         .scripts
         .iter()
         .map(|(name, entry)| (name, entry, false))
@@ -271,15 +297,10 @@ if __name__ == '__main__':
             import_name = import_name,
             func = func,
         );
-        let script = shebang.clone() + &script;
         // Only support launch scripts with PEP 397 launcher on Windows now
-        let ext = if gui { ".pyw" } else { ".py" };
-        let name = if cfg!(target_os = "windows") && !name.ends_with(ext) {
-            format!("{}{}", name, ext)
-        } else {
-            name.to_string()
-        };
-        let script_path = script_dir.join(name);
+        let ext = interpreter
+            .run_script("import sysconfig; print(sysconfig.get_config_var('EXE'), end='')")?;
+        let script_path = script_dir.join(format!("{}{}", name, ext));
         // We only need to set the executable bit on unix
         let mut file = {
             #[cfg(not(target_os = "windows"))]
@@ -301,10 +322,30 @@ if __name__ == '__main__':
             script_path.display()
         ))?;
 
-        file.write_all(script.as_bytes()).context(format!(
-            "Failed to write to file at {}",
-            script_path.display()
-        ))?;
+        let mut write_all = |bytes: &[u8]| -> Result<()> {
+            file.write_all(bytes).context(format!(
+                "Failed to write to file at {}",
+                script_path.display()
+            ))
+        };
+
+        #[cfg(target_os = "windows")]
+        {
+            let launcher = get_launcher(interpreter, _gui)?;
+            let mut zip = zip::ZipWriter::new(Cursor::new(Vec::new()));
+            zip.start_file("__main__.py", zip::write::FileOptions::default())?;
+            zip.write_all(script.as_bytes())?;
+            let archive = zip.finish()?;
+            write_all(launcher)?;
+            write_all(shebang.as_bytes())?;
+            write_all(&archive.into_inner())?;
+        }
+
+        #[cfg(not(target_os = "windows"))]
+        {
+            let script = shebang.clone() + &script;
+            write_all(script.as_bytes())?;
+        }
     }
 
     Ok(())
diff --git a/src/resources/t32.exe b/src/resources/t32.exe
new file mode 100644
index 000000000..8932a18e4
Binary files /dev/null and b/src/resources/t32.exe differ
diff --git a/src/resources/t64.exe b/src/resources/t64.exe
new file mode 100644
index 000000000..325b8057c
Binary files /dev/null and b/src/resources/t64.exe differ
diff --git a/src/resources/w32.exe b/src/resources/w32.exe
new file mode 100644
index 000000000..e6439e9e4
Binary files /dev/null and b/src/resources/w32.exe differ
diff --git a/src/resources/w64.exe b/src/resources/w64.exe
new file mode 100644
index 000000000..46139dbf9
Binary files /dev/null and b/src/resources/w64.exe differ