diff --git a/r2/Makefile b/r2/Makefile
index f8ae67411..db934e7db 100644
--- a/r2/Makefile
+++ b/r2/Makefile
@@ -185,6 +185,8 @@ $(JS_OUTPUTS): $(JS_MODULE_BUILDSTAMPS)
 
 define JS_MODULE_TEMPLATE
 $(BUILD_DIR)/js-$(1)-buildstamp: $$(shell $(PYTHON) r2/lib/js.py dependencies $(1))
+	# remove mangled output symlinks, similar to above.
+	rm -f $$(shell $(PYTHON) r2/lib/js.py enumerate_outputs $(1))
 	paster run standalone r2/lib/js.py -c "build_module('$(1)')"
 	touch $$@
 endef
diff --git a/r2/r2/lib/js.py b/r2/r2/lib/js.py
index b1adffa21..be87f39e3 100755
--- a/r2/r2/lib/js.py
+++ b/r2/r2/lib/js.py
@@ -308,8 +308,13 @@ def dependencies(name):
         print dep
 
 @build_command
-def enumerate_outputs():
-    for m in module.itervalues():
+def enumerate_outputs(*names):
+    if names:
+        modules = [module[name] for name in names]
+    else:
+        modules = module.itervalues()
+
+    for m in modules:
         for output in m.outputs:
             print output