diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 6639955fe..4f9ef4da3 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -751,7 +751,7 @@ object Defaults extends BuildCommon {
   def mainRunMainTask = runMain <<= runMainTask(fullClasspath in Runtime, runner in run)
 
   def discoverMainClasses(analysis: inc.Analysis): Seq[String] =
-    Discovery.applications(Tests.allDefs(analysis)) collect { case (definition, discovered) if (discovered.hasMain) => definition.name }
+    Discovery.applications(Tests.allDefs(analysis)).collect({ case (definition, discovered) if discovered.hasMain => definition.name }).sorted
 
   def consoleProjectTask = (state, streams, initialCommands in consoleProject) map { (state, s, extra) => ConsoleProject(state, extra)(s.log); println() }
   def consoleTask: Initialize[Task[Unit]] = consoleTask(fullClasspath, console)
diff --git a/notes/0.13.8.markdown b/notes/0.13.8.markdown
new file mode 100644
index 000000000..f6499fe20
--- /dev/null
+++ b/notes/0.13.8.markdown
@@ -0,0 +1,6 @@
+[@kretes]: https://github.com/kretes
+[1180]: https://github.com/sbt/sbt/issues/1180
+
+### Improvements
+
+- Discovered main classes are now sorted. [#1180][1180] by [@kretes][@kretes]
\ No newline at end of file