diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/DefaultScriptVariableSource.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/DefaultScriptVariableSource.java
index a9080b04b7..1b1a883348 100644
--- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/DefaultScriptVariableSource.java
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/DefaultScriptVariableSource.java
@@ -62,7 +62,7 @@ public class DefaultScriptVariableSource implements BeanFactoryAware, ScriptVari
 			}		
 		}
 		// custom logic
-		this.doResolveScriptVariables(scriptVariables);
+		this.doResolveScriptVariables(scriptVariables, message);
 		return scriptVariables;
 	}
 	/**
@@ -71,7 +71,7 @@ public class DefaultScriptVariableSource implements BeanFactoryAware, ScriptVari
 	 * 
 	 * @param variables
 	 */
-	protected void doResolveScriptVariables(Map<String, Object> variables){
+	protected void doResolveScriptVariables(Map<String, Object> variables, Message<?> message){
 		
 	}
 }
diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java
index a4e4d6861d..5df85ae54c 100644
--- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java
+++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java
@@ -17,6 +17,7 @@ import java.util.Map;
 
 import org.springframework.context.Lifecycle;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.integration.Message;
 import org.springframework.integration.config.AbstractSimpleMessageHandlerFactoryBean;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.groovy.DefaultScriptVariableSource;
@@ -57,7 +58,7 @@ public class GroovyControlBusFactoryBean extends AbstractSimpleMessageHandlerFac
 	
 	private class ManagedBeansScriptVariableSource extends DefaultScriptVariableSource {
 		@Override
-		protected void doResolveScriptVariables(Map<String, Object> variables){
+		protected void doResolveScriptVariables(Map<String, Object> variables, Message<?> message){
 			if (this.beanFactory != null){
 				for (String name : this.beanFactory.getBeanDefinitionNames()) {
 					Object bean = this.beanFactory.getBean(name);
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
index ae9d4ebeba..39b1abe05a 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java
@@ -72,7 +72,7 @@ public class GroovyScriptExecutingMessageProcessorTests {
 		ScriptSource scriptSource = new ResourceScriptSource(resource);
 		Object result = null;
 		class CustomScriptVariableSource extends DefaultScriptVariableSource{
-			protected void doResolveScriptVariables(Map<String, Object> variables){
+			protected void doResolveScriptVariables(Map<String, Object> variables, Message<?> message){
 				variables.put("date", System.nanoTime());
 			}
 		}
diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
index 9c1cb5d426..b82e432f84 100644
--- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
+++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java
@@ -128,7 +128,7 @@ public class GroovyServiceActivatorTests {
 	}
 
 	public static class SampleScriptVariSource extends DefaultScriptVariableSource{
-		protected void doResolveScriptVariables(Map<String, Object> variables){
+		protected void doResolveScriptVariables(Map<String, Object> variables, Message<?> message){
 			variables.put("foo", "foo");
 			variables.put("bar", "bar");
 			variables.put("date", new Date());