diff --git a/scripts/test-cli.sh b/scripts/test-cli.sh
index c824fb1..0fcd920 100755
--- a/scripts/test-cli.sh
+++ b/scripts/test-cli.sh
@@ -48,8 +48,9 @@ test -s out || fail "scalajsp bin/Foo$.sjsir: empty output"
 scalajsp bin/Foo\$A.sjsir > out
 test -s out || fail "scalajsp bin/Foo\$A.sjsir: empty output"
 
-scalajsld -o test.js -mm Foo.main bin
+scalajsld -s -o test.js -mm Foo.main bin
 test -s test.js || fail "scalajsld: empty output"
+test -s test.js.map || fail "scalajsld: empty source map"
 
 node test.js > got.run
 cat > want.run <<EOF
diff --git a/src/main/scala/org/scalajs/cli/Scalajsld.scala b/src/main/scala/org/scalajs/cli/Scalajsld.scala
index 502ad24..aafca78 100644
--- a/src/main/scala/org/scalajs/cli/Scalajsld.scala
+++ b/src/main/scala/org/scalajs/cli/Scalajsld.scala
@@ -26,6 +26,7 @@ import scala.concurrent.ExecutionContext.Implicits.global
 
 import java.io.File
 import java.net.URI
+import java.nio.file.Path
 
 object Scalajsld {
 
@@ -169,8 +170,19 @@ object Scalajsld {
 
       val linker = StandardImpl.linker(config)
       val logger = new ScalaConsoleLogger(options.logLevel)
-      val outFile = PathOutputFile(options.output.toPath())
-      val output = LinkerOutput(outFile)
+
+      val output = {
+        val js = options.output.toPath()
+        val sm = js.resolveSibling(js.getFileName().toString() + ".map")
+
+        def relURI(f: Path) =
+          new URI(null, null, f.getFileName().toString, null)
+
+        LinkerOutput(PathOutputFile(js))
+          .withSourceMap(PathOutputFile(sm))
+          .withSourceMapURI(relURI(sm))
+          .withJSFileURI(relURI(js))
+      }
 
       val cache = StandardImpl.irFileCache().newCache