diff --git a/config/alfresco/file-servers.properties b/config/alfresco/file-servers.properties
index 8e48d4b855..5f2e44923f 100644
--- a/config/alfresco/file-servers.properties
+++ b/config/alfresco/file-servers.properties
@@ -9,5 +9,6 @@ cifs.ipv6=disabled
 cifs.hostannounce=true
 
 ftp.enabled=true
+ftp.ipv6=enabled
 
 nfs.enabled=false
diff --git a/config/alfresco/file-servers.xml b/config/alfresco/file-servers.xml
index 5f3f078953..2fe5f89cf1 100644
--- a/config/alfresco/file-servers.xml
+++ b/config/alfresco/file-servers.xml
@@ -100,6 +100,9 @@
       <port>1121</port>
       -->
 
+	  <!-- IPv6 support -->
+	  <IPv6 state="${ftp.ipv6}"/>
+	  
       <!-- FTP authentication -->
       <!-- Available types are 'alfresco' and 'passthru' -->
       <authenticator type="alfresco"/>
diff --git a/source/java/org/alfresco/filesys/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/ServerConfigurationBean.java
index cc7d773dbc..e741928dbd 100644
--- a/source/java/org/alfresco/filesys/ServerConfigurationBean.java
+++ b/source/java/org/alfresco/filesys/ServerConfigurationBean.java
@@ -1415,6 +1415,17 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean {
             ftpConfig.setFTPDebug(ftpDbg);
         }
         
+        // Check if IPv6 support should be enabled
+        
+        elem = config.getConfigElement("IPv6");
+        if ( elem != null) {
+        	
+			// Enable IPv6 support
+
+        	if ( elem.hasAttribute("state") && elem.getAttribute("state").equalsIgnoreCase("enabled"))
+        		ftpConfig.setIPv6Enabled( true);
+        }
+        
         // Check if a character set has been specified
         
         elem = config.getConfigElement( "charSet");