diff --git a/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java b/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java
index f4a31cda1f..b016ca7672 100644
--- a/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java
+++ b/source/java/org/alfresco/repo/module/ModuleDetailsImpl.java
@@ -32,6 +32,7 @@ import org.alfresco.service.cmr.module.ModuleInstallState;
 import org.springframework.extensions.surf.util.ISO8601DateFormat;
 import org.alfresco.util.Pair;
 import org.alfresco.util.VersionNumber;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * Module details implementation.
@@ -280,6 +281,10 @@ public class ModuleDetailsImpl implements ModuleDetails
         {
             properties.setProperty(PROP_REPO_VERSION_MAX, repoVersionMax.toString());
         }
+        if (editions != null)
+        {
+            properties.setProperty(PROP_EDITIONS, StringUtils.join(editions,","));
+        }
         if (dependencies.size() > 0)
         {
             for (ModuleDependency dependency : dependencies)
diff --git a/source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java b/source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java
index af663fdd71..35bf9493ee 100644
--- a/source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java
+++ b/source/java/org/alfresco/repo/module/ModuleDetailsImplTest.java
@@ -47,7 +47,7 @@ public class ModuleDetailsImplTest extends TestCase
         defaultProperties.setProperty(ModuleDetails.PROP_TITLE, "Test");
         defaultProperties.setProperty(ModuleDetails.PROP_DESCRIPTION, "Test description");
         defaultProperties.setProperty(ModuleDetails.PROP_VERSION, "1.0.0");
-        defaultProperties.setProperty(ModuleDetails.PROP_EDITIONS, "Community");
+        defaultProperties.setProperty(ModuleDetails.PROP_EDITIONS, "Community, Enterprise");
         defaultProperties.setProperty(ModuleDetails.PROP_REPO_VERSION_MIN, new VersionNumber("1.2").toString());
         defaultProperties.setProperty(ModuleDetails.PROP_REPO_VERSION_MAX, new VersionNumber("1.4.3").toString());
         defaultProperties.setProperty(ModuleDetails.PROP_DEPENDS_PREFIX + "a", "1.2.3");