--- kernel/ietbsd.h.orig	2014-07-23 22:45:36.000000000 -0700
+++ kernel/ietbsd.h	2014-07-23 22:46:55.000000000 -0700
@@ -642,7 +642,9 @@
 #define SAM_STAT_RESERVATION_CONFLICT	SCSI_STATUS_RESERV_CONFLICT
 #define SAM_STAT_CHECK_CONDITION	SCSI_STATUS_CHECK_COND
 #define WRITE_VERIFY			0x2e
+#ifndef VERIFY_16
 #define VERIFY_16			0x8f
+#endif
 #define DATA_PROTECT			SSD_KEY_DATA_PROTECT
 #define NO_SENSE			SSD_KEY_NO_SENSE
 #define MEDIUM_ERROR			SSD_KEY_MEDIUM_ERROR
--- kernel/conn.c.orig	2015-02-13 14:23:20.438348146 -0800
+++ kernel/conn.c	2015-02-13 14:33:52.728261609 -0800
@@ -80,7 +80,11 @@
 
 	if ((so->so_state & SS_ISDISCONNECTING) ||(so->so_state & SS_ISDISCONNECTED))
 		conn_close(conn);
+#if __FreeBSD_version >= 1100048
+	else if (soreadable(so))
+#else
 	else if (so->so_rcv.sb_cc || !(so->so_rcv.sb_state & SBS_CANTRCVMORE))
+#endif
 		__nthread_wakeup(info);
 
 	return (SU_OK);