diff --git a/api/src/main/java/org/openmrs/Order.java b/api/src/main/java/org/openmrs/Order.java
index 2390cce8eb1c..760d3ce181c7 100644
--- a/api/src/main/java/org/openmrs/Order.java
+++ b/api/src/main/java/org/openmrs/Order.java
@@ -56,11 +56,13 @@ public enum Action {
 		DISCONTINUE,
 		RENEW
 	}
-	
+
 	/**
 	 * Valid values for the status of an order that is received from a filler
+	 * Aligned with FHIR Task Status: https://hl7.org/fhir/codesystem-task-status.html
 	 * @since 2.2.0
 	 * @since 2.6.1 added ON_HOLD & DECLINED
+	 * @since 3.0.0 added DRAFT, REQUESTED, ACCEPTED, REJECTED, READY, CANCELLED, FAILED, ENTERED_IN_ERROR
 	 */
 	public enum FulfillerStatus {
 		RECEIVED,
@@ -68,7 +70,14 @@ public enum FulfillerStatus {
 		EXCEPTION,
 		ON_HOLD,
 		DECLINED,
-		COMPLETED
+		COMPLETED,
+		DRAFT,           
+		REQUESTED,       
+		ACCEPTED,       
+		REJECTED,     
+		CANCELLED,     
+		FAILED,        
+		ENTERED_IN_ERROR 
 	}
 	
 	private Integer orderId;