Index: src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.java
===================================================================
--- src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.java	(revision 767934)
+++ src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.java	(working copy)
@@ -61,8 +61,6 @@
 
     private static final String USER_PREFS = "userPrefs";
 
-    private static final String ENTITIES = "entities";
-
     public PortalDataSerializer()
     {
         super();
@@ -90,8 +88,6 @@
 
         private boolean doUserPrefs = true;
 
-        private boolean doEntities = true;
-
         /* Constructor */
         public ExportForm(final String id)
         {
@@ -114,9 +110,6 @@
             add(new ExportCheckBox(USER_PREFS, new PropertyModel<Boolean>(this, "doUserPrefs")));
             add(new Label("userPrefsLabel", new ResourceModel("export.user_preferences")));
 
-            add(new ExportCheckBox(ENTITIES, new PropertyModel<Boolean>(this, "doEntities")));
-            add(new Label("entitiesLabel", new ResourceModel("export.portlet_entities")));
-
             this.exportResourceProvider = new ExportResourceProvider(getPortletRequest().getUserPrincipal().getName());
 
             DynamicResourceLink downloadLink = new DynamicResourceLink("exportLink", new PropertyModel<ExportResourceProvider>(this,
@@ -128,13 +121,19 @@
                 @Override
                 public void onClick()
                 {
+                	
+                	// the permissions options needs the users/groups/roles option and therefore 
+                	// triggers it
+                	if (doPermissions) {
+                		doUserGroupsRoles = true;
+                	}
+                	
                     Map<String, Object> settings = new HashMap<String, Object>();
                     settings.put(JetspeedSerializer.KEY_PROCESS_USERS, new Boolean(doUserGroupsRoles));
                     settings.put(JetspeedSerializer.KEY_PROCESS_PERMISSIONS, new Boolean(doPermissions));
                     settings.put(JetspeedSerializer.KEY_PROCESS_PROFILER, new Boolean(doProfiling));
                     settings.put(JetspeedSerializer.KEY_PROCESS_CAPABILITIES, new Boolean(doCapabilities));
                     settings.put(JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES, new Boolean(doUserPrefs));
-                    settings.put(JetspeedSerializer.KEY_PROCESS_ENTITIES, new Boolean(doEntities));
                     settings.put(JetspeedSerializer.KEY_EXPORT_INDENTATION, "\t");
                     settings.put(JetspeedSerializer.KEY_OVERWRITE_EXISTING, Boolean.TRUE);
                     settings.put(JetspeedSerializer.KEY_BACKUP_BEFORE_PROCESS, Boolean.FALSE);
@@ -281,7 +280,6 @@
             settings.put(JetspeedSerializer.KEY_PROCESS_PROFILER, Boolean.TRUE);
             settings.put(JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES, Boolean.TRUE);
             settings.put(JetspeedSerializer.KEY_PROCESS_PORTAL_PREFERENCES, Boolean.TRUE);
-            settings.put(JetspeedSerializer.KEY_PROCESS_ENTITIES, Boolean.TRUE);
             settings.put(JetspeedSerializer.KEY_OVERWRITE_EXISTING, Boolean.TRUE);
             settings.put(JetspeedSerializer.KEY_BACKUP_BEFORE_PROCESS, Boolean.FALSE);
         }
Index: src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.html
===================================================================
--- src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.html	(revision 767934)
+++ src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.html	(working copy)
@@ -40,10 +40,6 @@
 		          	<label wicket:id="permissionsLabel" for="permissions" class="portlet-form-field-label">_permissions</label>
 		        </div>
 		        <div>
-		        	<input type="checkbox" wicket:id="entities" id="entities" class="portlet-form-field">
-		          	<label wicket:id="entitiesLabel" for="entities" class="portlet-form-field-label">_portlet_entities</label>
-		        </div>
-		        <div>
 		        	<input type="checkbox" wicket:id="userPrefs" id="userPrefs" class="portlet-form-field">
 		          	<label wicket:id="userPrefsLabel" for="userPrefs" class="portlet-form-field-label">_user_preferences</label>
 		        </div>
Index: src/main/java/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
===================================================================
--- src/main/java/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties	(revision 767934)
+++ src/main/java/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties	(working copy)
@@ -20,8 +20,7 @@
 export.permissions=Permissions (triggers exporting Users/Groups/Roles)
 export.profiling_rules=Profiling Rules
 export.capabilities=Capabilities (mimetypes, mediatypes, capabilities, clients)
-export.portlet_entities=Portlet Entities
-export.user_preferences=User Preferences (triggers exporting Portlet Entities)
+export.user_preferences=User Preferences
 export.action=Export
 
 export.message.exception=Export failed: {0} with message {1}