diff --git a/lime/tools/helpers/HTML5Helper.hx b/lime/tools/helpers/HTML5Helper.hx
index 52ca91123..01969c19c 100644
--- a/lime/tools/helpers/HTML5Helper.hx
+++ b/lime/tools/helpers/HTML5Helper.hx
@@ -191,6 +191,20 @@ class HTML5Helper {
 					
 				}
 				
+				if (project.targetFlags.exists ("source-map")) {
+					
+					args.push ("--create_source_map");
+					args.push (tempFile + ".map");
+					
+					if (FileSystem.exists(sourceFile + ".map")) {
+						
+						args.push ("--source_map_input");
+						args.push (sourceFile + "|" + sourceFile + ".map");
+						
+					}
+				
+				}
+				
 				if (!LogHelper.verbose) {
 					
 					args.push ("--jscomp_off=uselessCode");
@@ -199,6 +213,13 @@ class HTML5Helper {
 				
 				ProcessHelper.runCommand ("", "java", args);
 				
+				if (project.targetFlags.exists ("source-map")) {
+					
+					File.copy (tempFile + ".map", sourceFile + ".map");
+					FileSystem.deleteFile (tempFile + ".map");
+					
+				}
+				
 			}
 			
 			FileSystem.deleteFile (sourceFile);
diff --git a/templates/bin/compiler.jar b/templates/bin/compiler.jar
index a297dc0f1..f82540559 100644
Binary files a/templates/bin/compiler.jar and b/templates/bin/compiler.jar differ