diff --git a/js/js.translator/lib/dart-ast.jar b/js/js.translator/lib/dart-ast.jar
index a88d4fc045e..ba5c8028bdc 100644
Binary files a/js/js.translator/lib/dart-ast.jar and b/js/js.translator/lib/dart-ast.jar differ
diff --git a/js/js.translator/lib/src/dart-ast-src.jar b/js/js.translator/lib/src/dart-ast-src.jar
index 9e97ea9dc2f..b03781e1fbc 100644
Binary files a/js/js.translator/lib/src/dart-ast-src.jar and b/js/js.translator/lib/src/dart-ast-src.jar differ
diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
index 0ad368ae9dd..f6e0c1a7296 100644
--- a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+++ b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
@@ -54,11 +54,11 @@ public final class K2JSTranslator {
         K2JSTranslator translator = new K2JSTranslator(config);
         File outFile = new File(outputPath);
         TextOutputImpl output = new TextOutputImpl();
-        SourceMapBuilder sourceMapBuilder = config.isSourcemap() ? new SourceMapBuilder(outFile.getName(), output, new SourceMapBuilderConsumer()) : null;
+        SourceMapBuilder sourceMapBuilder = config.isSourcemap() ? new SourceMapBuilder(outFile, output, new SourceMapBuilderConsumer()) : null;
         String programCode = translator.generateProgramCode(files, mainCall, output, sourceMapBuilder);
         FileUtil.writeToFile(outFile, programCode);
         if (sourceMapBuilder != null) {
-            FileUtil.writeToFile(new File(outFile.getParentFile(), sourceMapBuilder.getOutFilename()), sourceMapBuilder.build());
+            FileUtil.writeToFile(sourceMapBuilder.getOutFile(), sourceMapBuilder.build());
         }
     }
 
diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java b/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java
index 90db9c0a6ab..00b5d4f1c80 100644
--- a/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java
+++ b/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java
@@ -36,6 +36,6 @@ class SourceMapBuilderConsumer implements PairConsumer<SourceMapBuilder, Object>
         assert document != null;
         int line = document.getLineNumber(offset);
         int column = offset - document.getLineStartOffset(line);
-        builder.addMapping(file.getViewProvider().getVirtualFile().getPath(), line, column);
+        builder.addMapping(file.getViewProvider().getVirtualFile().getUrl(), line, column);
     }
 }