diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index 1bac79f9ececaa..edc987aa47b3a3 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -48,6 +48,7 @@
     ('*tools/cpp/runfiles/generated_*',
      lambda x: 'tools/cpp/runfiles/' + os.path.basename(x)[len('generated_'):]),
     ('*launcher.exe', lambda x: 'tools/launcher/launcher.exe'),
+    ('*launcher_maker.exe', lambda x: 'tools/launcher/launcher_maker.exe'),
     ('*def_parser.exe', lambda x: 'tools/def_parser/def_parser.exe'),
     ('*zipper.exe', lambda x: 'tools/zip/zipper/zipper.exe'),
     ('*zipper', lambda x: 'tools/zip/zipper/zipper'),
diff --git a/tools/launcher/BUILD.tools b/tools/launcher/BUILD.tools
index 36465665bf2a85..c7f0a352e4b638 100644
--- a/tools/launcher/BUILD.tools
+++ b/tools/launcher/BUILD.tools
@@ -20,5 +20,18 @@ filegroup(
 
 filegroup(
     name = "launcher_maker",
-    srcs = ["//src/tools/launcher:launcher_maker"],
+    srcs = select({
+        "//src/conditions:host_windows": [":launcher_maker_windows"],
+        "//conditions:default": [
+            "//src/tools/launcher:launcher_maker",
+        ],
+    }),
+)
+
+filegroup(
+    name = "launcher_maker_windows",
+    srcs = select({
+        "//src/conditions:remote": ["//src/tools/launcher:launcher_maker"],
+        "//conditions:default": ["launcher_maker.exe"],
+    }),
 )