diff --git a/include/iscsi.h b/include/iscsi.h
index 1d1b2e1..f774cb8 100644
--- a/include/iscsi.h
+++ b/include/iscsi.h
@@ -656,6 +656,11 @@ iscsi_write16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		   int wrprotect, int dpo, int fua, int fua_nv, int group_number,
 		   iscsi_command_cb cb, void *private_data);
 EXTERN struct scsi_task *
+iscsi_orwrite16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
+		   unsigned char *data, uint32_t datalen, int blocksize,
+		   int wrprotect, int dpo, int fua, int fua_nv, int group_number,
+		   iscsi_command_cb cb, void *private_data);
+EXTERN struct scsi_task *
 iscsi_compareandwrite_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		   unsigned char *data, uint32_t datalen, int blocksize,
 		   int wrprotect, int dpo, int fua, int fua_nv, int group_number,
@@ -781,6 +786,11 @@ iscsi_write16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		   unsigned char *data, uint32_t datalen, int blocksize,
 		   int wrprotect, int dpo, int fua, int fua_nv, int group_number);
 
+EXTERN struct scsi_task *
+iscsi_orwrite16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
+		   unsigned char *data, uint32_t datalen, int blocksize,
+		   int wrprotect, int dpo, int fua, int fua_nv, int group_number);
+
 EXTERN struct scsi_task *
 iscsi_compareandwrite_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		   unsigned char *data, uint32_t datalen, int blocksize,
diff --git a/include/scsi-lowlevel.h b/include/scsi-lowlevel.h
index b7e4363..2fe80c9 100644
--- a/include/scsi-lowlevel.h
+++ b/include/scsi-lowlevel.h
@@ -40,6 +40,7 @@ enum scsi_opcode {
 	SCSI_OPCODE_READ16             = 0x88,
 	SCSI_OPCODE_COMPARE_AND_WRITE  = 0x89,
 	SCSI_OPCODE_WRITE16            = 0x8A,
+	SCSI_OPCODE_ORWRITE16          = 0x8B,
 	SCSI_OPCODE_WRITE_VERIFY16     = 0x8E,
 	SCSI_OPCODE_VERIFY16           = 0x8F,
 	SCSI_OPCODE_PREFETCH16         = 0x90,
@@ -132,6 +133,10 @@ struct scsi_write16_params {
 	uint64_t lba;
 	uint32_t num_blocks;
 };
+struct scsi_orwrite16_params {
+	uint64_t lba;
+	uint32_t num_blocks;
+};
 struct scsi_compareandwrite_params {
 	uint64_t lba;
 	uint32_t num_blocks;
@@ -224,6 +229,7 @@ struct scsi_task {
 		struct scsi_write10_params         write10;
 		struct scsi_write12_params         write12;
 		struct scsi_write16_params         write16;
+		struct scsi_orwrite16_params       orwrite16;
 		struct scsi_compareandwrite_params compareandwrite;
 		struct scsi_writeverify10_params   writeverify10;
 		struct scsi_writeverify12_params   writeverify12;
@@ -656,6 +662,7 @@ EXTERN struct scsi_task *scsi_cdb_read16(uint64_t lba, uint32_t xferlen, int blo
 EXTERN struct scsi_task *scsi_cdb_write10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
 EXTERN struct scsi_task *scsi_cdb_write12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
 EXTERN struct scsi_task *scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
+EXTERN struct scsi_task *scsi_cdb_orwrite16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
 EXTERN struct scsi_task *scsi_cdb_compareandwrite(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number);
 EXTERN struct scsi_task *scsi_cdb_writeverify10(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number);
 EXTERN struct scsi_task *scsi_cdb_writeverify12(uint32_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int bytchk, int group_number);
diff --git a/lib/libiscsi.def b/lib/libiscsi.def
index cbfad61..ac299cc 100644
--- a/lib/libiscsi.def
+++ b/lib/libiscsi.def
@@ -88,6 +88,8 @@ iscsi_write12_sync
 iscsi_write12_task
 iscsi_write16_sync
 iscsi_write16_task
+iscsi_orwrite16_sync
+iscsi_orwrite16_task
 iscsi_compareandwrite_sync
 iscsi_compareandwrite_task
 iscsi_writeverify10_sync
@@ -122,6 +124,7 @@ scsi_cdb_verify16
 scsi_cdb_write10
 scsi_cdb_write12
 scsi_cdb_write16
+scsi_cdb_orwrite16
 scsi_cdb_writeverify10
 scsi_cdb_writeverify12
 scsi_cdb_writeverify16
diff --git a/lib/libiscsi.syms b/lib/libiscsi.syms
index db1ca20..174687a 100644
--- a/lib/libiscsi.syms
+++ b/lib/libiscsi.syms
@@ -86,6 +86,8 @@ iscsi_write12_sync
 iscsi_write12_task
 iscsi_write16_sync
 iscsi_write16_task
+iscsi_orwrite16_sync
+iscsi_orwrite16_task
 iscsi_compareandwrite_sync
 iscsi_compareandwrite_task
 iscsi_writeverify10_sync
@@ -120,6 +122,7 @@ scsi_cdb_verify16
 scsi_cdb_write10
 scsi_cdb_write12
 scsi_cdb_write16
+scsi_cdb_orwrite16
 scsi_cdb_writeverify10
 scsi_cdb_writeverify12
 scsi_cdb_writeverify16
diff --git a/lib/scsi-command.c b/lib/scsi-command.c
index b252407..8365c5f 100644
--- a/lib/scsi-command.c
+++ b/lib/scsi-command.c
@@ -870,6 +870,41 @@ iscsi_write16_task(struct iscsi_context *iscsi, int lun, uint64_t lba,
 	return task;
 }
 
+struct scsi_task *
+iscsi_orwrite16_task(struct iscsi_context *iscsi, int lun, uint64_t lba, 
+		   unsigned char *data, uint32_t datalen, int blocksize,
+		   int wrprotect, int dpo, int fua, int fua_nv, int group_number,
+		   iscsi_command_cb cb, void *private_data)
+{
+	struct scsi_task *task;
+	struct iscsi_data outdata;
+
+	if (datalen % blocksize != 0) {
+		iscsi_set_error(iscsi, "Datalen:%d is not a multiple of the "
+				"blocksize:%d.", datalen, blocksize);
+		return NULL;
+	}
+
+	task = scsi_cdb_orwrite16(lba, datalen, blocksize, wrprotect,
+				dpo, fua, fua_nv, group_number);
+	if (task == NULL) {
+		iscsi_set_error(iscsi, "Out-of-memory: Failed to create "
+				"orwrite16 cdb.");
+		return NULL;
+	}
+
+	outdata.data = data;
+	outdata.size = datalen;
+
+	if (iscsi_scsi_command_async(iscsi, lun, task, cb, &outdata,
+				       private_data) != 0) {
+		scsi_free_scsi_task(task);
+		return NULL;
+	}
+
+	return task;
+}
+
 struct scsi_task *
 iscsi_compareandwrite_task(struct iscsi_context *iscsi, int lun, uint64_t lba, 
 		   unsigned char *data, uint32_t datalen, int blocksize,
diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c
index d81214c..ebd62be 100644
--- a/lib/scsi-lowlevel.c
+++ b/lib/scsi-lowlevel.c
@@ -983,6 +983,53 @@ scsi_cdb_write16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, i
 	return task;
 }
 
+/*
+ * ORWRITE16
+ */
+struct scsi_task *
+scsi_cdb_orwrite16(uint64_t lba, uint32_t xferlen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group_number)
+{
+	struct scsi_task *task;
+
+	task = malloc(sizeof(struct scsi_task));
+	if (task == NULL) {
+		return NULL;
+	}
+
+	memset(task, 0, sizeof(struct scsi_task));
+	task->cdb[0]   = SCSI_OPCODE_ORWRITE16;
+
+	task->cdb[1] |= ((wrprotect & 0x07) << 5);
+	if (dpo) {
+		task->cdb[1] |= 0x10;
+	}
+	if (fua) {
+		task->cdb[1] |= 0x08;
+	}
+	if (fua_nv) {
+		task->cdb[1] |= 0x02;
+	}
+
+	*(uint32_t *)&task->cdb[2] = htonl(lba >> 32);
+	*(uint32_t *)&task->cdb[6] = htonl(lba & 0xffffffff);
+	*(uint32_t *)&task->cdb[10] = htonl(xferlen/blocksize);
+
+	task->cdb[14] |= (group_number & 0x1f);
+
+	task->cdb_size = 16;
+	if (xferlen != 0) {
+		task->xfer_dir = SCSI_XFER_WRITE;
+	} else {
+		task->xfer_dir = SCSI_XFER_NONE;
+	}
+	task->expxferlen = xferlen;
+
+	task->params.orwrite16.lba        = lba;
+	task->params.orwrite16.num_blocks = xferlen/blocksize;
+
+	return task;
+}
+
 /*
  * COMPAREANDWRITE
  */
diff --git a/lib/sync.c b/lib/sync.c
index f72fa7a..961eb5e 100644
--- a/lib/sync.c
+++ b/lib/sync.c
@@ -528,6 +528,29 @@ iscsi_write16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
 	return state.task;
 }
 
+struct scsi_task *
+iscsi_orwrite16_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
+		   unsigned char *data, uint32_t datalen, int blocksize,
+		   int wrprotect, int dpo, int fua, int fua_nv, int group_number)
+{
+	struct iscsi_sync_state state;
+
+	memset(&state, 0, sizeof(state));
+
+	if (iscsi_orwrite16_task(iscsi, lun, lba,
+			       data, datalen, blocksize, wrprotect, 
+			       dpo, fua, fua_nv, group_number,
+			       scsi_sync_cb, &state) == NULL) {
+		iscsi_set_error(iscsi,
+				"Failed to send Orwrite16 command");
+		return NULL;
+	}
+
+	event_loop(iscsi, &state);
+
+	return state.task;
+}
+
 struct scsi_task *
 iscsi_compareandwrite_sync(struct iscsi_context *iscsi, int lun, uint64_t lba,
 		   unsigned char *data, uint32_t datalen, int blocksize,