diff --git a/lib/dns/config/confctl.c b/lib/dns/config/confctl.c
index 65e2bbe772..5344d0aba6 100644
--- a/lib/dns/config/confctl.c
+++ b/lib/dns/config/confctl.c
@@ -112,7 +112,7 @@ dns_c_ctrllist_delete(dns_c_ctrllist_t **list)
 
 isc_result_t
 dns_c_ctrlinet_new(isc_mem_t *mem, dns_c_ctrl_t **control,
-		   isc_sockaddr_t addr, short port,
+		   isc_sockaddr_t addr, in_port_t port,
 		   dns_c_ipmatchlist_t *iml, isc_boolean_t copy)
 {
 	dns_c_ctrl_t  *ctrl;
@@ -229,7 +229,7 @@ dns_c_ctrl_delete(dns_c_ctrl_t **control)
 void
 dns_c_ctrl_print(FILE *fp, int indent, dns_c_ctrl_t *ctl)
 {
-	short port;
+	in_port_t port;
 	dns_c_ipmatchlist_t *iml;
 
 	REQUIRE(DNS_C_CONFCTL_VALID(ctl));
diff --git a/lib/dns/config/confctx.c b/lib/dns/config/confctx.c
index 791f534749..561526da2f 100644
--- a/lib/dns/config/confctx.c
+++ b/lib/dns/config/confctx.c
@@ -1622,7 +1622,7 @@ dns_c_ctx_setquerysourceaddr(dns_c_ctx_t *cfg, isc_sockaddr_t addr)
 
 
 isc_result_t
-dns_c_ctx_setquerysourceport(dns_c_ctx_t *cfg, short port)
+dns_c_ctx_setquerysourceport(dns_c_ctx_t *cfg, in_port_t port)
 {
 	isc_boolean_t existed;
 	isc_result_t res;
@@ -2846,7 +2846,7 @@ dns_c_ctx_getquerysourceaddr(dns_c_ctx_t *cfg, isc_sockaddr_t *addr)
 
 
 isc_result_t
-dns_c_ctx_getquerysourceport(dns_c_ctx_t *cfg, short *port)
+dns_c_ctx_getquerysourceport(dns_c_ctx_t *cfg, in_port_t *port)
 {
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
diff --git a/lib/dns/include/dns/confctl.h b/lib/dns/include/dns/confctl.h
index e9dd2c83bd..f9b716c2dd 100644
--- a/lib/dns/include/dns/confctl.h
+++ b/lib/dns/include/dns/confctl.h
@@ -91,7 +91,7 @@ struct dns_c_ctrl
 	union {
 		struct {
 			isc_sockaddr_t addr;
-			short port;
+			in_port_t port;
 			dns_c_ipmatchlist_t *matchlist;
 		} inet_v; /* when control_type == dns_c_inet_control  */
 		struct {
@@ -122,7 +122,7 @@ struct dns_c_ctrl_list
 
 
 isc_result_t	dns_c_ctrlinet_new(isc_mem_t *mem, dns_c_ctrl_t **control,
-				   isc_sockaddr_t addr, short port,
+				   isc_sockaddr_t addr, in_port_t port,
 				   dns_c_ipmatchlist_t *iml,
 				   isc_boolean_t copy);
 /*
diff --git a/lib/dns/include/dns/confctx.h b/lib/dns/include/dns/confctx.h
index e152664f14..4fa159f607 100644
--- a/lib/dns/include/dns/confctx.h
+++ b/lib/dns/include/dns/confctx.h
@@ -178,7 +178,7 @@ struct dns_c_options
 	isc_boolean_t		rfc2308_type1;
 	
 	isc_sockaddr_t		query_source_addr;
-	short			query_source_port;
+	in_port_t		query_source_port;
 
 	dns_c_severity_t	check_names[DNS_C_TRANSCOUNT];
 
@@ -358,7 +358,7 @@ isc_result_t	dns_c_ctx_setrfc2308type1(dns_c_ctx_t *cfg,
 isc_result_t	dns_c_ctx_setdialup(dns_c_ctx_t *cfg, isc_boolean_t newval);
 isc_result_t	dns_c_ctx_setquerysourceaddr(dns_c_ctx_t *cfg,
 					     isc_sockaddr_t addr);
-isc_result_t	dns_c_ctx_setquerysourceport(dns_c_ctx_t *cfg, short port);
+isc_result_t	dns_c_ctx_setquerysourceport(dns_c_ctx_t *cfg, in_port_t port);
 isc_result_t	dns_c_ctx_setchecknames(dns_c_ctx_t *cfg,
 					dns_c_trans_t transtype,
 					dns_c_severity_t sever);
@@ -487,7 +487,7 @@ isc_result_t	dns_c_ctx_getdialup(dns_c_ctx_t *cfg, isc_boolean_t *retval);
 isc_result_t	dns_c_ctx_getquerysourceaddr(dns_c_ctx_t *cfg,
 					     isc_sockaddr_t *addr);
 isc_result_t	dns_c_ctx_getquerysourceport(dns_c_ctx_t *cfg,
-					     short *port);
+					     in_port_t *port);
 isc_result_t	dns_c_ctx_getchecknames(dns_c_ctx_t *cfg,
 					dns_c_trans_t transtype,
 					dns_c_severity_t *sever);
diff --git a/lib/dns/include/dns/conflsn.h b/lib/dns/include/dns/conflsn.h
index a1c46068ec..1c2b70954b 100644
--- a/lib/dns/include/dns/conflsn.h
+++ b/lib/dns/include/dns/conflsn.h
@@ -84,7 +84,7 @@ struct dns_c_lstn_on
 	isc_mem_t		       *mem;
 	isc_uint32_t			magic;
 	
-	short				port;
+	in_port_t			port;
 	dns_c_ipmatchlist_t	       *iml;
 
 	ISC_LINK(dns_c_lstnon_t)	next;