diff --git a/main/src/main/scala/sbt/internal/Script.scala b/main/src/main/scala/sbt/internal/Script.scala
index b44debebd..9ead77992 100644
--- a/main/src/main/scala/sbt/internal/Script.scala
+++ b/main/src/main/scala/sbt/internal/Script.scala
@@ -20,10 +20,20 @@ object Script {
   lazy val command =
     Command.command(Name) { state =>
       val scriptArg = state.remainingCommands.headOption getOrElse sys.error("No script file specified")
-      val script = new File(scriptArg).getAbsoluteFile
-      val hash = Hash.halve(Hash.toHex(Hash(script.getAbsolutePath)))
+      val scriptFile = new File(scriptArg).getAbsoluteFile
+      val hash = Hash.halve(Hash.toHex(Hash(scriptFile.getAbsolutePath)))
       val base = new File(CommandUtil.bootDirectory(state), hash)
       IO.createDirectory(base)
+      val src = new File(base, "src_managed")
+      IO.createDirectory(src)
+      // handle any script extension or none
+      val scalaFile = {
+        val dotIndex = scriptArg.lastIndexOf(".")
+        if (dotIndex == -1) scriptArg + ".scala"
+        else scriptArg.substring(0, dotIndex) + ".scala"
+      }
+      val script = new File(src, scalaFile)
+      IO.copyFile(scriptFile, script)
 
       val (eval, structure) = Load.defaultLoad(state, base, state.log)
       val session = Load.initialSession(structure, eval)
diff --git a/notes/0.13.12/native-script-support.md b/notes/0.13.12/native-script-support.md
new file mode 100644
index 000000000..67e4fda65
--- /dev/null
+++ b/notes/0.13.12/native-script-support.md
@@ -0,0 +1,9 @@
+  [@ekrich]: https://github.com/ekrich
+
+### Fixes with compatibility implications
+
+### Improvements
+
+- Add Windows script support and native file extensions on Unix platforms. By [@ekrich][@ekrich]
+
+### Bug fixes
\ No newline at end of file