diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index ad95a1ce0d7..78ca36fc2a0 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -182,7 +182,7 @@ divert_packet(struct mbuf *m, bool incoming)
 		    (((struct ipfw_rule_ref *)(mtag+1))->info));
 	} else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) {
 		cookie = ((struct pf_divert_mtag *)(mtag+1))->idir;
-		nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir);
+		nport = htons(((struct pf_divert_mtag *)(mtag+1))->port);
 	} else {
 		m_freem(m);
 		return;
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index a8c687682af..a8a9adc1d4c 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -328,11 +328,17 @@ extern int	(*ip_dn_ctl_ptr)(struct sockopt *);
 extern int	(*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *);
 
 /* pf specific mtag for divert(4) support */
-enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 };
+__enum_uint8_decl(pf_mtag_dir) {
+	PF_DIVERT_MTAG_DIR_IN = 1,
+	PF_DIVERT_MTAG_DIR_OUT = 2
+};
 struct pf_divert_mtag {
-	uint16_t idir;	// initial pkt direction
-	uint16_t ndir;	// a) divert(4) port upon initial diversion
-			// b) new direction upon pkt re-enter
+	__enum_uint8(pf_mtag_dir) idir;	// initial pkt direction
+	union {
+		__enum_uint8(pf_mtag_dir) ndir;	// a) divert(4) port upon initial diversion
+				// b) new direction upon pkt re-enter
+		uint16_t port;	/* Initial divert(4) port */
+	};
 };
 #define MTAG_PF_DIVERT	1262273569
 
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index eb2e09b2e6f..4990dce653b 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -8249,7 +8249,7 @@ done:
 		mtag = m_tag_alloc(MTAG_PF_DIVERT, 0,
 		    sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO);
 		if (mtag != NULL) {
-			((struct pf_divert_mtag *)(mtag+1))->ndir =
+			((struct pf_divert_mtag *)(mtag+1))->port =
 			    ntohs(r->divert.port);
 			((struct pf_divert_mtag *)(mtag+1))->idir =
 			    (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN :