--- a/components/grails/Makefile	Sun Feb 23 22:46:55 2014 -0800
+++ b/components/grails/Makefile	Mon Feb 24 07:50:30 2014 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -39,9 +39,19 @@
 include ../../make-rules/ant.mk
 include ../../make-rules/ips.mk
 
+# Make sure we use the specially modified versions of grails and grails-debug
+COMPONENT_POST_UNPACK_ACTION = \
+	$(CP) $(COMPONENT_DIR)/files/grails $(SOURCE_DIR)/bin; \
+	$(CP) $(COMPONENT_DIR)/files/grails-debug $(SOURCE_DIR)/bin
+
 COMPONENT_PRE_BUILD_ACTION = $(MKDIR) $(@D)/tmp 
 COMPONENT_BUILD_ENV += "ANT_OPTS=-Djava.io.tmpdir=$(BUILD_DIR_32)/tmp"
 
+# Need to package the .jar files we've built, not the ones included in
+# the source tarball.
+PKG_PROTO_DIRS = $(BUILD_DIR_32) $(MANGLED_DIR) $(PROTO_DIR) $(@D) \
+	$(COMPONENT_DIR) $(COMPONENT_SRC)
+
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets