diff --git a/sbin/ipf/libipf/printhash_live.c b/sbin/ipf/libipf/printhash_live.c
index b8ee31b27597..427daa18316b 100644
--- a/sbin/ipf/libipf/printhash_live.c
+++ b/sbin/ipf/libipf/printhash_live.c
@@ -1,68 +1,72 @@
 /*
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 
 #include <sys/ioctl.h>
 #include "ipf.h"
 #include "netinet/ipl.h"
 
 
 iphtable_t *
 printhash_live(iphtable_t *hp, int fd, char *name, int opts, wordtab_t *fields)
 {
 	iphtent_t entry, zero;
 	ipflookupiter_t iter;
 	int last, printed;
 	ipfobj_t obj;
 
 	if ((name != NULL) && strncmp(name, hp->iph_name, FR_GROUPLEN))
 		return (hp->iph_next);
 
 	if (fields == NULL)
 		printhashdata(hp, opts);
 
 	if ((hp->iph_flags & IPHASH_DELETE) != 0)
 		PRINTF("# ");
 
-	if ((opts & OPT_DEBUG) == 0)
+	if (opts & OPT_SAVEOUT)
+		PRINTF("{\n");
+	else if ((opts & OPT_DEBUG) == 0)
 		PRINTF("\t{");
 
 	obj.ipfo_rev = IPFILTER_VERSION;
 	obj.ipfo_type = IPFOBJ_LOOKUPITER;
 	obj.ipfo_ptr = &iter;
 	obj.ipfo_size = sizeof(iter);
 
 	iter.ili_data = &entry;
 	iter.ili_type = IPLT_HASH;
 	iter.ili_otype = IPFLOOKUPITER_NODE;
 	iter.ili_ival = IPFGENITER_LOOKUP;
 	iter.ili_unit = hp->iph_unit;
 	strncpy(iter.ili_name, hp->iph_name, FR_GROUPLEN);
 
 	last = 0;
 	printed = 0;
 	bzero((char *)&zero, sizeof(zero));
 
 	while (!last && (ioctl(fd, SIOCLOOKUPITER, &obj) == 0)) {
 		if (entry.ipe_next == NULL)
 			last = 1;
 		if (bcmp(&zero, &entry, sizeof(zero)) == 0)
 			break;
+		if (opts & OPT_SAVEOUT)
+			PRINTF("\t");
 		(void) printhashnode(hp, &entry, bcopywrap, opts, fields);
 		printed++;
 	}
 	if (last == 0)
 		ipferror(fd, "walking hash nodes");
 
 	if (printed == 0)
 		putchar(';');
 
-	if ((opts & OPT_DEBUG) == 0)
+	if ((opts & OPT_DEBUG) == 0 || (opts & OPT_SAVEOUT))
 		PRINTF(" };\n");
 
 	(void) ioctl(fd,SIOCIPFDELTOK, &iter.ili_key);
 
 	return (hp->iph_next);
 }
diff --git a/sbin/ipf/libipf/printhashdata.c b/sbin/ipf/libipf/printhashdata.c
index ba96a75a94d7..6fa62e67556d 100644
--- a/sbin/ipf/libipf/printhashdata.c
+++ b/sbin/ipf/libipf/printhashdata.c
@@ -1,94 +1,107 @@
 /*
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 
 #include "ipf.h"
 #include <ctype.h>
 
 
 void
 printhashdata(iphtable_t *hp, int opts)
 {
 
-	if ((opts & OPT_DEBUG) == 0) {
+	if (opts & OPT_SAVEOUT) {
+		if ((hp->iph_flags & IPHASH_DELETE) == IPHASH_DELETE)
+			PRINTF("# ");
+		PRINTF("pool ");
+	} else if ((opts & OPT_DEBUG) == 0) {
 		if ((hp->iph_type & IPHASH_ANON) == IPHASH_ANON)
 			PRINTF("# 'anonymous' table refs %d\n", hp->iph_ref);
 		if ((hp->iph_flags & IPHASH_DELETE) == IPHASH_DELETE)
 			PRINTF("# ");
 		switch (hp->iph_type & ~IPHASH_ANON)
 		{
 		case IPHASH_LOOKUP :
 			PRINTF("table");
 			break;
 		case IPHASH_GROUPMAP :
 			PRINTF("group-map");
 			if (hp->iph_flags & FR_INQUE)
 				PRINTF(" in");
 			else if (hp->iph_flags & FR_OUTQUE)
 				PRINTF(" out");
 			else
 				PRINTF(" ???");
 			break;
 		default :
 			PRINTF("%#x", hp->iph_type);
 			break;
 		}
 		PRINTF(" role=");
 	} else {
 		if ((hp->iph_flags & IPHASH_DELETE) == IPHASH_DELETE)
 			PRINTF("# ");
 		PRINTF("Hash Table %s: %s",
 			ISDIGIT(*hp->iph_name) ? "Number" : "Name",
 			hp->iph_name);
 		if ((hp->iph_type & IPHASH_ANON) == IPHASH_ANON)
 			PRINTF("(anon)");
 		putchar(' ');
 		PRINTF("Role: ");
 	}
 
 	printunit(hp->iph_unit);
 
-	if ((opts & OPT_DEBUG) == 0) {
+	if ((opts & OPT_SAVEOUT)) {
+		if ((hp->iph_type & ~IPHASH_ANON) == IPHASH_LOOKUP)
+			PRINTF("/hash");
+		PRINTF("(%s \"%s\"; size %lu;",
+			ISDIGIT(*hp->iph_name) ? "number" : "name",
+			hp->iph_name, (u_long)hp->iph_size);
+		if (hp->iph_seed != 0)
+			PRINTF(" seed %lu;", hp->iph_seed);
+		PRINTF(")\n", hp->iph_seed);
+	} else if ((opts & OPT_DEBUG) == 0) {
 		if ((hp->iph_type & ~IPHASH_ANON) == IPHASH_LOOKUP)
 			PRINTF(" type=hash");
 		PRINTF(" %s=%s size=%lu",
 			ISDIGIT(*hp->iph_name) ? "number" : "name",
 			hp->iph_name, (u_long)hp->iph_size);
 		if (hp->iph_seed != 0)
 			PRINTF(" seed=%lu", hp->iph_seed);
 		putchar('\n');
 	} else {
 		PRINTF(" Type: ");
 		switch (hp->iph_type & ~IPHASH_ANON)
 		{
 		case IPHASH_LOOKUP :
 			PRINTF("lookup");
 			break;
 		case IPHASH_GROUPMAP :
 			PRINTF("groupmap Group. %s", hp->iph_name);
 			break;
 		default :
 			break;
 		}
 
 		putchar('\n');
 		PRINTF("\t\tSize: %lu\tSeed: %lu",
 			(u_long)hp->iph_size, hp->iph_seed);
 		PRINTF("\tRef. Count: %d\tMasks: %#x\n", hp->iph_ref,
 			hp->iph_maskset[0]);
 	}
 
 	if ((opts & OPT_DEBUG) != 0) {
 		struct in_addr m;
 		int i;
 
 		for (i = 0; i < 32; i++) {
 			if ((1 << i) & hp->iph_maskset[0]) {
 				ntomask(AF_INET, i, &m.s_addr);
 				PRINTF("\t\tMask: %s\n", inet_ntoa(m));
 			}
 		}
 	}
 }