diff --git a/portal-service/src/com/liferay/portlet/wiki/service/persistence/WikiPageExportActionableDynamicQuery.java b/portal-service/src/com/liferay/portlet/wiki/service/persistence/WikiPageExportActionableDynamicQuery.java
index 2a50e10c2f2fcdcafcacec8542f25c944fcea2c2..bfafce0dd79479e643cb3687eae6793fa899975f 100644
--- a/portal-service/src/com/liferay/portlet/wiki/service/persistence/WikiPageExportActionableDynamicQuery.java
+++ b/portal-service/src/com/liferay/portlet/wiki/service/persistence/WikiPageExportActionableDynamicQuery.java
@@ -14,11 +14,14 @@
 
 package com.liferay.portlet.wiki.service.persistence;
 
+import com.liferay.portal.kernel.dao.orm.Criterion;
+import com.liferay.portal.kernel.dao.orm.Disjunction;
 import com.liferay.portal.kernel.dao.orm.DynamicQuery;
 import com.liferay.portal.kernel.dao.orm.Projection;
 import com.liferay.portal.kernel.dao.orm.ProjectionFactoryUtil;
 import com.liferay.portal.kernel.dao.orm.Property;
 import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil;
+import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.lar.ExportImportHelperUtil;
@@ -28,6 +31,7 @@ import com.liferay.portal.kernel.lar.StagedModelDataHandler;
 import com.liferay.portal.kernel.lar.StagedModelDataHandlerRegistryUtil;
 import com.liferay.portal.kernel.lar.StagedModelDataHandlerUtil;
 import com.liferay.portal.kernel.lar.StagedModelType;
+import com.liferay.portal.kernel.workflow.WorkflowConstants;
 import com.liferay.portal.util.PortalUtil;
 
 import com.liferay.portlet.wiki.model.WikiPage;
@@ -69,14 +73,32 @@ public class WikiPageExportActionableDynamicQuery
 
 	@Override
 	protected void addCriteria(DynamicQuery dynamicQuery) {
-		_portletDataContext.addDateRangeCriteria(dynamicQuery, "modifiedDate");
+		Criterion modifiedDateCriterion = _portletDataContext.getDateRangeCriteria(
+				"modifiedDate");
+		Criterion statusDateCriterion = _portletDataContext.getDateRangeCriteria(
+				"statusDate");
 
-		StagedModelDataHandler<?> stagedModelDataHandler = StagedModelDataHandlerRegistryUtil.getStagedModelDataHandler(WikiPage.class.getName());
+		if ((modifiedDateCriterion != null) && (statusDateCriterion != null)) {
+			Disjunction disjunction = RestrictionsFactoryUtil.disjunction();
+
+			disjunction.add(modifiedDateCriterion);
+			disjunction.add(statusDateCriterion);
+
+			dynamicQuery.add(disjunction);
+		}
 
 		Property workflowStatusProperty = PropertyFactoryUtil.forName("status");
 
-		dynamicQuery.add(workflowStatusProperty.in(
-				stagedModelDataHandler.getExportableStatuses()));
+		if (_portletDataContext.isInitialPublication()) {
+			dynamicQuery.add(workflowStatusProperty.ne(
+					WorkflowConstants.STATUS_IN_TRASH));
+		}
+		else {
+			StagedModelDataHandler<?> stagedModelDataHandler = StagedModelDataHandlerRegistryUtil.getStagedModelDataHandler(WikiPage.class.getName());
+
+			dynamicQuery.add(workflowStatusProperty.in(
+					stagedModelDataHandler.getExportableStatuses()));
+		}
 	}
 
 	@Override
