diff --git a/main/Defaults.scala b/main/Defaults.scala
index d7a8e1e5a..dc7e95af8 100755
--- a/main/Defaults.scala
+++ b/main/Defaults.scala
@@ -59,7 +59,7 @@ object Defaults extends BuildCommon
 		crossVersion :== CrossVersion.Disabled,
 		scalaOrganization :== ScalaArtifacts.Organization,
 		buildDependencies <<= buildDependencies or Classpaths.constructBuildDependencies,
-		taskTemporaryDirectory := IO.createTemporaryDirectory,
+		taskTemporaryDirectory := { val dir = IO.createTemporaryDirectory; dir.deleteOnExit(); dir },
 		onComplete <<= taskTemporaryDirectory { dir => () => IO.delete(dir); IO.createDirectory(dir) },
 		concurrentRestrictions <<= concurrentRestrictions or defaultRestrictions,
 		parallelExecution :== true,