diff --git a/context.cpp b/context.cpp
index 77729a27c9..f1facefec5 100644
--- a/context.cpp
+++ b/context.cpp
@@ -111,7 +111,7 @@ namespace Sass {
       }
     }
 
-    emitter.set_filename(output_path);
+    emitter.set_filename(resolve_relative_path(output_path, source_map_file, cwd));
 
   }