diff --git a/security/sedutil/Makefile b/security/sedutil/Makefile
index 0d8f64855d24..577a4dbbff79 100644
--- a/security/sedutil/Makefile
+++ b/security/sedutil/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	sedutil
 PORTVERSION=	1.12
 CATEGORIES=	security
 
 MAINTAINER=	ken@FreeBSD.org
 COMMENT=	Self Encrypting Drive utility
 
 LICENSE=	GPLv3+
 
 USES=		gmake pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kendmerry
 GH_PROJECT=	sedutil
 GH_TAGNAME=	3122ba0
 
-WRKSRC_SUBDIR=	freebsd/CLI
+BUILD_WRKSRC=	${WRKSRC}/freebsd/CLI
 ALL_TARGET=	build
 
 PLIST_FILES+=	bin/sedutil-cli
-SEDUTIL_SD=	${WRKSRC}/dist/Release/CLang-Generic
+SEDUTIL_SD=	${BUILD_WRKSRC}/dist/Release/CLang-Generic
 SEDUTIL_PROG=	sedutil-cli
 
 do-install:
 	${INSTALL_PROGRAM} ${SEDUTIL_SD}/${SEDUTIL_PROG} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/security/sedutil/files/patch-Common_DtaAnnotatedDump.h b/security/sedutil/files/patch-Common_DtaAnnotatedDump.h
new file mode 100644
index 000000000000..588fbe6fae34
--- /dev/null
+++ b/security/sedutil/files/patch-Common_DtaAnnotatedDump.h
@@ -0,0 +1,11 @@
+--- Common/DtaAnnotatedDump.h.orig	2017-05-17 20:10:01 UTC
++++ Common/DtaAnnotatedDump.h
+@@ -17,7 +17,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #pragma once 
+ #pragma pack(push,1)
+ 
+-typedef union
++typedef union TAG_CAtomHeader
+ {
+     // four bytes in big endian (network) byte order
+     uint8_t     all[4];