diff --git a/portal-service/src/com/liferay/portlet/wiki/service/persistence/WikiNodeExportActionableDynamicQuery.java b/portal-service/src/com/liferay/portlet/wiki/service/persistence/WikiNodeExportActionableDynamicQuery.java
index e4c656eb717327362327dbabb4eba476326ab348..35debd3cd1daac1d051bba37262e5cc09c359784 100644
--- a/portal-service/src/com/liferay/portlet/wiki/service/persistence/WikiNodeExportActionableDynamicQuery.java
+++ b/portal-service/src/com/liferay/portlet/wiki/service/persistence/WikiNodeExportActionableDynamicQuery.java
@@ -14,9 +14,12 @@
 
 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.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;
@@ -26,6 +29,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.WikiNode;
@@ -67,14 +71,32 @@ public class WikiNodeExportActionableDynamicQuery
 
 	@Override
 	protected void addCriteria(DynamicQuery dynamicQuery) {
-		_portletDataContext.addDateRangeCriteria(dynamicQuery, "modifiedDate");
+		Criterion modifiedDateCriterion = _portletDataContext.getDateRangeCriteria(
+				"modifiedDate");
+		Criterion statusDateCriterion = _portletDataContext.getDateRangeCriteria(
+				"statusDate");
 
-		StagedModelDataHandler<?> stagedModelDataHandler = StagedModelDataHandlerRegistryUtil.getStagedModelDataHandler(WikiNode.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(WikiNode.class.getName());
+
+			dynamicQuery.add(workflowStatusProperty.in(
+					stagedModelDataHandler.getExportableStatuses()));
+		}
 	}
 
 	protected StagedModelType getStagedModelType() {
