--- old/make/ModuleWrapper.gmk	2016-10-18 12:09:11.871618200 -0500
+++ new/make/ModuleWrapper.gmk	2016-10-18 12:09:10.931567700 -0500
@@ -86,6 +86,13 @@
         $(TARGETS)), \
 ))
 
+$(eval $(call SetupCopyFiles, COPY_JAVAACCESSBRIDGE, \
+    SRC := $(SUPPORT_OUTPUTDIR)/modules_javaaccessbridge/$(MODULE), \
+    DEST := $(JDK_OUTPUTDIR)/javaaccessbridge, \
+    FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_javaaccessbridge/$(MODULE)/%, \
+        $(TARGETS)), \
+))
+
 $(eval $(call SetupCopyFiles, COPY_CMDS, \
     SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE), \
     DEST := $(JDK_OUTPUTDIR)/bin, \
@@ -100,4 +107,5 @@
 ))
 
 all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
-    $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB)
+    $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB) \
+	$(COPY_JAVAACCESSBRIDGE)