diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundGatewayParser.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundGatewayParser.java
index 8c7fed7ac4..3366bc9a87 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundGatewayParser.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileOutboundGatewayParser.java
@@ -18,14 +18,17 @@ package org.springframework.integration.file.config;
 
 import org.w3c.dom.Element;
 
+import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractConsumerEndpointParser;
+import org.springframework.util.StringUtils;
 
 /**
  * Parser for the 'outbound-gateway' element of the file namespace.
  * 
  * @author Mark Fisher
+ * @author Oleg Zhurakousky
  * @since 1.0.3
  */
 public class FileOutboundGatewayParser extends AbstractConsumerEndpointParser {
@@ -38,7 +41,31 @@ public class FileOutboundGatewayParser extends AbstractConsumerEndpointParser {
 	@Override
 	protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) {
 		String replyChannel = element.getAttribute("reply-channel");
- 		return FileWritingMessageHandlerBeanDefinitionBuilder.configure(element, replyChannel, parserContext);
+		
+		BeanDefinitionBuilder handlerBuilder = 
+			FileWritingMessageHandlerBeanDefinitionBuilder.configure(element, replyChannel, parserContext);
+		
+		String remoteFileNameGenerator = element.getAttribute("filename-generator");
+		String remoteFileNameGeneratorExpression = element.getAttribute("filename-generator-expression");
+		boolean hasRemoteFileNameGenerator = StringUtils.hasText(remoteFileNameGenerator);
+		boolean hasRemoteFileNameGeneratorExpression = StringUtils.hasText(remoteFileNameGeneratorExpression);
+		if (hasRemoteFileNameGenerator || hasRemoteFileNameGeneratorExpression) {
+			if (hasRemoteFileNameGenerator && hasRemoteFileNameGeneratorExpression) {
+				throw new BeanDefinitionStoreException("at most one of 'filename-generator-expression' or 'filename-generator' " +
+						"is allowed on file outbound adapter/gateway");
+			}
+			if (hasRemoteFileNameGenerator) {
+				handlerBuilder.addPropertyReference("fileNameGenerator", remoteFileNameGenerator);
+			}
+			else {
+				BeanDefinitionBuilder fileNameGeneratorBuilder = BeanDefinitionBuilder.genericBeanDefinition(
+						"org.springframework.integration.file.DefaultFileNameGenerator");
+				fileNameGeneratorBuilder.addPropertyValue("expression", remoteFileNameGeneratorExpression);
+				handlerBuilder.addPropertyValue("fileNameGenerator", fileNameGeneratorBuilder.getBeanDefinition());
+			}
+		}
+		
+ 		return handlerBuilder;
 	}
 
 }
diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
index fd344387cd..d6c82e8d14 100644
--- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
+++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
@@ -198,6 +198,14 @@ Only files matching this regular expression will be picked up by this adapter.
                 </xsd:appinfo>
             </xsd:annotation>
         </xsd:attribute>
+        <xsd:attribute name="filename-generator-expression" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+				Allows you to provide SpEL expression which will compute file name of 
+			    the target file (e.g., assuming payload is java.io.File "payload.getName() + '.transfered'");
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
         <xsd:attribute name="temporary-file-suffix" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation>