diff --git a/make/sun/rmi/rmi/Makefile b/make/sun/rmi/rmi/Makefile
index 35e4163c5a8c46b95b74aedd6556356037566a34..127777229e42a8338f6cda4836e43432b5625f77 100644
--- a/make/sun/rmi/rmi/Makefile
+++ b/make/sun/rmi/rmi/Makefile
@@ -85,16 +85,21 @@ REMOTE_impls = \
 	sun.rmi.registry.RegistryImpl \
 	sun.rmi.transport.DGCImpl
 
-ifeq ($(PLATFORM), windows)
-build: stubs
-else # PLATFORM
-ifneq ($(ARCH_DATA_MODEL), 32)
-build: stubs
-else # ARCH_DATA_MODEL
-build: stubs bin
+#
+# The java-rmi.cgi script in bin/ only gets delivered in certain situations
+#
+BUILD_TARGETS = stubs
+ifeq ($(PLATFORM), linux)
+  BUILD_TARGETS += bin
 endif
+ifeq ($(PLATFORM), solaris)
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    BUILD_TARGETS += bin
+  endif
 endif
 
+build: $(BUILD_TARGETS)
+
 clean clobber:: bin.clean