diff --git a/config/alfresco/subsystems/fileServers/default/file-servers-context.xml b/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
index 3ccc5b654c..55a76241ba 100644
--- a/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
+++ b/config/alfresco/subsystems/fileServers/default/file-servers-context.xml
@@ -197,6 +197,11 @@
          <value>${ftp.port}</value>
       </property>
 
+      <!-- IPv6 support -->
+      <property name="ipv6Enabled">
+         <value>${ftp.ipv6.enabled}</value>
+      </property>
+
       <!-- FTP authentication -->
       <property name="authenticator">
          <ref bean="FtpAuthenticator" />
diff --git a/config/alfresco/subsystems/fileServers/default/file-servers.properties b/config/alfresco/subsystems/fileServers/default/file-servers.properties
index 53d8a60601..fbbfa3ffc0 100644
--- a/config/alfresco/subsystems/fileServers/default/file-servers.properties
+++ b/config/alfresco/subsystems/fileServers/default/file-servers.properties
@@ -29,6 +29,7 @@ cifs.WINS.secondary=5.6.7.8
 
 ftp.enabled=true
 ftp.port=21
+ftp.ipv6.enabled=true
 
 nfs.enabled=false
 
diff --git a/source/java/org/alfresco/filesys/config/FTPConfigBean.java b/source/java/org/alfresco/filesys/config/FTPConfigBean.java
index da0a4a3e6b..3c57975a54 100644
--- a/source/java/org/alfresco/filesys/config/FTPConfigBean.java
+++ b/source/java/org/alfresco/filesys/config/FTPConfigBean.java
@@ -62,6 +62,9 @@ public class FTPConfigBean
     /** The authenticator. */
     private FTPAuthenticator authenticator;
 
+    /** Is IP v6 enabled? */
+    private boolean ipv6Enabled;
+
     /**
      * Checks if is server enabled.
      * 
@@ -250,4 +253,25 @@ public class FTPConfigBean
     {
         this.authenticator = authenticator;
     }
+
+    /**
+     * Checks if IP v6 is enabled.
+     * 
+     * @return <code>true</code> if IP v6 is enabled
+     */
+    public boolean getIpv6Enabled()
+    {
+        return ipv6Enabled;
+    }
+
+    /**
+     * Indicates whether IP v6 should be enabled.
+     * 
+     * @param ipv6Enabled
+     *            <code>true</code> if IP v6 should be enabled
+     */
+    public void setIpv6Enabled(boolean ipv6Enabled)
+    {
+        this.ipv6Enabled = ipv6Enabled;
+    }
 }
diff --git a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
index a56d1349b4..3aa2dfe713 100644
--- a/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
+++ b/source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
@@ -1262,6 +1262,10 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean
                 ftpConfig.setFTPDebug(ftpDbg);
             }
 
+            // Check if IPv6 support should be enabled
+            
+            ftpConfig.setIPv6Enabled(ftpConfigBean.getIpv6Enabled());
+
             // Check if a character set has been specified
 
             String charSet = ftpConfigBean.getCharSet();