diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/ClientFactorySupport.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/ClientFactorySupport.java
index 6ba29e5e87..0140ded251 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/ClientFactorySupport.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/ClientFactorySupport.java
@@ -71,7 +71,7 @@ public class ClientFactorySupport {
         return defaultFtpClientFactory;
     }
 
-    public static DefaultFtpClientFactory ftpClientFactory(String host, int port, String remoteDir, String user, String pw, int clientMode) {
+    public static DefaultFtpClientFactory ftpClientFactory(String host, int port, String remoteDir, String user, String pw, int clientMode, int fileType) {
         DefaultFtpClientFactory defaultFtpClientFactory = new DefaultFtpClientFactory();
         defaultFtpClientFactory.setHost(host);
         defaultFtpClientFactory.setPassword(pw);
@@ -79,6 +79,7 @@ public class ClientFactorySupport {
         defaultFtpClientFactory.setRemoteWorkingDirectory(remoteDir);
         defaultFtpClientFactory.setUsername(user);
         defaultFtpClientFactory.setClientMode(clientMode);
+	    defaultFtpClientFactory.setFileType( fileType );
 
         return defaultFtpClientFactory;
     }
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
index 26782253f5..603175e8b3 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageHandlerFactoryBean.java
@@ -23,6 +23,12 @@ public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<Ftp
     protected String remoteDirectory;
     protected int clientMode;
 
+	public void setFileType(int fileType) {
+		this.fileType = fileType;
+	}
+
+	private int fileType ;
+
     // private vars
     private ResourceLoader resourceLoader;
     private ApplicationContext applicationContext;
@@ -46,7 +52,7 @@ public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<Ftp
     }
 
     protected AbstractFtpClientFactory clientFactory() {
-      return ClientFactorySupport.ftpClientFactory( this.host,   this.port ,  this.remoteDirectory , this.username , this.password , this.clientMode );
+      return ClientFactorySupport.ftpClientFactory( this.host,   this.port ,  this.remoteDirectory , this.username , this.password , this.clientMode, this.fileType );
     }
 
     @Override
@@ -59,6 +65,7 @@ public class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<Ftp
         QueuedFtpClientPool queuedFtpClientPool = new QueuedFtpClientPool(15, defaultFtpClientFactory);
 
         FtpSendingMessageHandler ftpSendingMessageHandler = new FtpSendingMessageHandler(queuedFtpClientPool);
+
         ftpSendingMessageHandler.afterPropertiesSet();
 
         return ftpSendingMessageHandler;
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java
index d74ccfb216..97725ba138 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpsSendingMessageHandlerFactoryBean.java
@@ -14,6 +14,9 @@ public class FtpsSendingMessageHandlerFactoryBean extends FtpSendingMessageHandl
 	   */
 	  protected volatile String protocol;
 
+
+
+
 	  /**
 	   * "P"
 	   */
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
index 2713aee47b..91d8aee891 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/impl/FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
@@ -38,6 +38,7 @@ public class FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean extends Ab
 	protected volatile int clientMode = FTPClient.ACTIVE_LOCAL_DATA_CONNECTION_MODE;
 	protected volatile int fileType = FTP.BINARY_FILE_TYPE;
 
+	@SuppressWarnings("unused")
 	public void setFileType(int fileType) {
 		this.fileType = fileType;
 	}
@@ -61,7 +62,8 @@ public class FtpRemoteFileSystemSynchronizingMessageSourceFactoryBean extends Ab
 	}
 
 	protected AbstractFtpClientFactory defaultClientFactory() throws Exception {
-		 return ClientFactorySupport.ftpClientFactory( this.host ,  Integer.parseInt(this.port) , this.remoteDirectory , this.username ,this.password, this.clientMode );
+		 return ClientFactorySupport.ftpClientFactory( this.host ,  Integer.parseInt(this.port) , this.remoteDirectory ,
+				 this.username ,this.password, this.clientMode , this.fileType);
 	}
 
 	protected String defaultFtpInboundFolderName = "ftpInbound";
diff --git a/spring-integration-ftp/src/test/resources/outbound-ftp-context.xml b/spring-integration-ftp/src/test/resources/outbound-ftp-context.xml
index 278b3b2110..d5002bcabb 100644
--- a/spring-integration-ftp/src/test/resources/outbound-ftp-context.xml
+++ b/spring-integration-ftp/src/test/resources/outbound-ftp-context.xml
@@ -29,6 +29,7 @@
 			remote-directory="${ftp.remotedir}"
 			channel="ftpOutbound"
 			host="${ftp.host}"
+			file-type="binary-file-type"
 			username="${ftp.username}"
 			password="${ftp.password}" port="2222"
 			client-mode="passive-local-data-connection-mode"
diff --git a/spring-integration-ftp/src/test/resources/outbound-ftps-context.xml b/spring-integration-ftp/src/test/resources/outbound-ftps-context.xml
index 6eb2275a70..7fb84efb39 100644
--- a/spring-integration-ftp/src/test/resources/outbound-ftps-context.xml
+++ b/spring-integration-ftp/src/test/resources/outbound-ftps-context.xml
@@ -29,6 +29,7 @@
 	<ftps:outbound-channel-adapter
 			remote-directory="${ftp.remotedir}"
 			channel="ftpOutbound"
+			file-type="binary-file-type"
 			host="${ftp.host}"
 			username="${ftp.username}"
 			password="${ftp.password}" port="21"
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java
index 4e2cbe8960..60ee242b96 100644
--- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/SftpNamespaceHandler.java
@@ -68,7 +68,7 @@ public class SftpNamespaceHandler extends NamespaceHandlerSupport {
 
 			IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "filter");
 
-			for (String p : "filename-pattern,auto-create-directories,username,password,host,key-file,key-file-password,remote-directory,local-working-directory,auto-delete-remote-files-on-sync".split(",")) {
+			for (String p : "filename-pattern,auto-create-directories,username,password,host,key-file,key-file-password,remote-directory,local-directory-path,auto-delete-remote-files-on-sync".split(",")) {
 				IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, p);
 			}
 
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizer.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizer.java
index e564c1bc27..f376ba4380 100644
--- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizer.java
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpInboundRemoteFileSystemSynchronizer.java
@@ -73,17 +73,20 @@ public class SftpInboundRemoteFileSystemSynchronizer extends AbstractInboundRemo
 
 				String remoteFqPath = this.remotePath + "/" + entry.getFilename();
 				in = sftpSession.getChannel().get(remoteFqPath);
-				IOUtils.copy(in, fileOutputStream);
+				try {
+					IOUtils.copy(in, fileOutputStream);
+				} finally {
+					IOUtils.closeQuietly(in);
+					IOUtils.closeQuietly(fileOutputStream);
+				}
 
 				if (tmpLocalTarget.renameTo(localFile)) {
-					// last step
 					this.acknowledge(sftpSession, entry);
 				}
 
 				return true;
 			} catch (Throwable th) {
-				IOUtils.closeQuietly(in);
-				IOUtils.closeQuietly(fileOutputStream);
+				logger.error("exception thrown in #copyFromRemoteToLocalDirectory", th);
 			}
 		} else {
 			return true;
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
index e34844c1b5..89ef3414e3 100644
--- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/impl/SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean.java
@@ -127,7 +127,7 @@ public class SftpRemoteFileSystemSynchronizingMessageSourceFactoryBean extends A
 		sftpMsgSrc.setAutoCreateDirectories(autoCreatDirs);
 
 		// local directories
-		if ((this.localDirectoryResource == null) || !StringUtils.hasText(this.localDirectoryPath)) {
+		if ((this.localDirectoryResource == null) && !StringUtils.hasText(this.localDirectoryPath)) {
 			File tmp = SystemUtils.getJavaIoTmpDir();
 			File sftpTmp = new File(tmp, "sftpInbound");
 			this.localDirectoryPath = "file://" + sftpTmp.getAbsolutePath();
diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
index 766d933e91..9a6ca08ef9 100644
--- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
+++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.0.xsd
@@ -107,7 +107,7 @@
 
 			<xsd:attribute name="username" type="xsd:string" use="required"/>
 			<xsd:attribute name="remote-directory" type="xsd:string" use="required"/>
-			<xsd:attribute name="local-working-directory" type="xsd:string"/>
+			<xsd:attribute name="local-directory-path" type="xsd:string"/>
 			<xsd:attribute name="host" type="xsd:string" use="required"/>
 
 			<xsd:attribute name="password" type="xsd:string"/>