diff --git a/sbin/ipf/libipf/load_poolnode.c b/sbin/ipf/libipf/load_poolnode.c
index 0e41a3921b71..880a6cd1c681 100644
--- a/sbin/ipf/libipf/load_poolnode.c
+++ b/sbin/ipf/libipf/load_poolnode.c
@@ -1,66 +1,84 @@
 
 /*
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * $Id$
  */
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "ipf.h"
 #include "netinet/ip_lookup.h"
 #include "netinet/ip_pool.h"
 
 
 int
 load_poolnode(int role, char *name, ip_pool_node_t *node, int ttl,
 	ioctlfunc_t iocfunc)
 {
 	ip_pool_node_t pn;
 	iplookupop_t op;
 	char *what;
 	int err;
 
 	if (pool_open() == -1)
 		return (-1);
 
 	op.iplo_unit = role;
 	op.iplo_type = IPLT_POOL;
 	op.iplo_arg = 0;
 	op.iplo_struct = &pn;
 	op.iplo_size = sizeof(pn);
 	strncpy(op.iplo_name, name, sizeof(op.iplo_name));
 
 	bzero((char *)&pn, sizeof(pn));
 	bcopy((char *)&node->ipn_addr, (char *)&pn.ipn_addr,
 	      sizeof(pn.ipn_addr));
 	bcopy((char *)&node->ipn_mask, (char *)&pn.ipn_mask,
 	      sizeof(pn.ipn_mask));
 	pn.ipn_info = node->ipn_info;
 	pn.ipn_die = ttl;
 	strncpy(pn.ipn_name, node->ipn_name, sizeof(pn.ipn_name));
 
 	if ((opts & OPT_REMOVE) == 0) {
 		what = "add";
 		err = pool_ioctl(iocfunc, SIOCLOOKUPADDNODE, &op);
 	} else {
 		what = "delete";
 		err = pool_ioctl(iocfunc, SIOCLOOKUPDELNODE, &op);
 	}
 
 	if (err != 0) {
 		if ((opts & OPT_DONOTHING) == 0) {
 			char msg[255];
+			char ipaddr[80], mask_msg[10], mask[8];
 
-			snprintf(msg, sizeof(msg), "%s pool(%s) node(%s/", what,
-				name, inet_ntoa(pn.ipn_addr.adf_addr.in4));
-			strlcat(msg, inet_ntoa(pn.ipn_mask.adf_addr.in4), sizeof(msg));
-			strcat(msg, ")");
+			inet_ntop(pn.ipn_addr.adf_family,
+				pn.ipn_addr.adf_addr.vptr, ipaddr,
+				sizeof(ipaddr));
+
+#ifdef USE_INET6
+			if (pn.ipn_mask.adf_family == AF_INET) {
+#endif
+				inet_ntop(pn.ipn_mask.adf_family,
+					pn.ipn_mask.adf_addr.vptr, mask,
+					sizeof(mask));
+				mask_msg[0]='/';
+				mask_msg[1]='\0';
+				strlcat(mask_msg, mask, sizeof(mask_msg));
+#ifdef USE_INET6
+			} else {
+				mask_msg[0]='\0';
+			}
+#endif
+
+			snprintf(msg, sizeof(msg), "%s pool(%s) node(%s%s)",
+				what, name, ipaddr, mask_msg);
 			return (ipf_perror_fd(pool_fd(), iocfunc, msg));
 		}
 	}
 
 	return (0);
 }