diff --git a/dns/firedns/Makefile b/dns/firedns/Makefile
index 4a8e9c5a4815..58ae91659f8c 100644
--- a/dns/firedns/Makefile
+++ b/dns/firedns/Makefile
@@ -1,37 +1,37 @@
 # New ports collection makefile for:	firedns
 # Date created:		Sun 12 May 22:30:00 WST 2002
 # Whom:			Dean Hollister <dean@odyssey.apana.org.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	firedns
-PORTVERSION=	0.1.29
-CATEGORIES=	net
+PORTVERSION=	0.1.30
+CATEGORIES=	net devel
 MASTER_SITES=	http://ares.penguinhosting.net/~ian/projects/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
 		ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	-${PORTVERSION}.tar.gz
 
 MAINTAINER=	dean@odyssey.apana.org.au
 
 BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring
 
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN3=		firedns_aton4.3 firedns_aton6.3 firedns_dnsbl_lookup.3 \
 		firedns_getip4.3 firedns_getip6.3 firedns_getmx.3 \
 		firedns_getname4.3 firedns_getname6.3 \
-		firedns_getresult.3 firedns_gettxt.3 \
-		firedns_ntoa4.3 firedns_ntoa6.3 firedns_resolveip4.3 \
-		firedns_resolveip6.3 firedns_resolvemx.3 \
+		firedns_getresult.3 firedns_gettxt.3 firedns_ntoa4.3 \
+		firedns_ntoa6.3 firedns_resolveip4.3 \
+		firedns_resolveip6.3  firedns_resolvemx.3 \
 		firedns_resolvename4.3 firedns_resolvename6.3 \
 		firedns_resolvetxt.3 libfiredns.3
 
 post-install:
 	@cd ${PREFIX}/lib; ${MV} libfiredns.so libfiredns.so.0; \
 	${LN} -s libfiredns.so.0 libfiredns.so
 
 .include <bsd.port.mk>
diff --git a/dns/firedns/distinfo b/dns/firedns/distinfo
index a7731a8e550d..b453abf7ff97 100644
--- a/dns/firedns/distinfo
+++ b/dns/firedns/distinfo
@@ -1 +1 @@
-MD5 (firedns-0.1.29.tar.gz) = 66b755377a04af143e7ced0e5c4cfd0d
+MD5 (firedns-0.1.30.tar.gz) = 0e18e14615036555183ee01b43fffd3c
diff --git a/dns/firedns/files/patch-configure b/dns/firedns/files/patch-configure
index 23357d52e6af..14470444fc3a 100644
--- a/dns/firedns/files/patch-configure
+++ b/dns/firedns/files/patch-configure
@@ -1,73 +1,78 @@
---- configure.orig	Sun Sep  1 05:15:24 2002
-+++ configure	Tue Oct 15 16:39:59 2002
-@@ -538,29 +538,29 @@
+--- configure.orig	Thu Oct 31 09:47:26 2002
++++ configure	Thu Oct 31 10:30:36 2002
+@@ -534,33 +534,33 @@
+ 
+ $ECHO -n "	adding rule to install binaries..."
+ $ECHO "install-binaries: $BINARIES" >> Makefile
+-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(BINDIR)" >> Makefile
++$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/bin" >> Makefile
  $ECHO "done"
  for BINARY in $BINARIES; do
  	$ECHO -n "	adding rule to install binary $BINARY..."
 -	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(BINDIR)" >> Makefile
 +	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(PREFIX)/bin" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
  
  $ECHO -n "	adding rule to install static libraries..."
  $ECHO "install-static: $STATIC" >> Makefile
 -$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
 +$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
  $ECHO "done"
  for LIBRARY in $STATIC; do
  	$ECHO -n "	adding rule to install static library $LIBRARY..."
 -	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
 +	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
  
  $ECHO -n "	adding rule to install shared libraries..."
  $ECHO "install-shared: $STATIC" >> Makefile
 -$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
 +$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
  $ECHO "done"
  for LIBRARY in $SHARED; do
  	$ECHO -n "	adding rule to install shared library $LIBRARY..."
 -	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
 +	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
 @@ -577,10 +577,10 @@
  	$ECHO "no firemake.headers found"
  fi
  $ECHO "install-headers: $HEADERS" >> Makefile
 -$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(INCLUDEDIR)" >> Makefile
 +$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/include" >> Makefile
  for HEADER in $HEADERS; do
  	$ECHO -n "	adding rule to install header $HEADER..."
 -	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(INCLUDEDIR)" >> Makefile
 +	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(PREFIX)/include" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
 @@ -592,8 +592,8 @@
  	LS=`ls man/*.$SECTION 2>>configure.log`
  	if test "$LS" != ""; then
  		$ECHO "man/*.$SECTION" >> Makefile
 -		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(MANDIR)/man$SECTION" >> Makefile
 -		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(MANDIR)/man$SECTION" >> Makefile
 +		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/man/man$SECTION" >> Makefile
 +		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(PREFIX)/man/man$SECTION" >> Makefile
  		$ECHO "done"
  	else
  		$ECHO >> Makefile
 @@ -618,9 +618,9 @@
  		$ECHO -n "conf/$CONF " >> Makefile
  	done
  	$ECHO >> Makefile
 -	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(CONFDIR)" >> Makefile
 +	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/etc" >> Makefile
  	for CONF in $CONFS; do
 -		$ECHO "	if test ! -f \$(CONFDIR)/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(CONFDIR); fi" >> Makefile
 +		$ECHO "	if test ! -f \$(PREFIX)/etc/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(PREFIX)/etc; fi" >> Makefile
  	done
  	$ECHO "done"
  else
diff --git a/dns/firedns/pkg-comment b/dns/firedns/pkg-comment
index 3ee42f86ba17..33c130fb9958 100644
--- a/dns/firedns/pkg-comment
+++ b/dns/firedns/pkg-comment
@@ -1 +1 @@
-Library for handling asynchronous DNS requests
+A C library for handling asynchronous DNS queries
diff --git a/dns/firedns/pkg-descr b/dns/firedns/pkg-descr
index 31f4d4231fe0..5e0d9ebe9c66 100644
--- a/dns/firedns/pkg-descr
+++ b/dns/firedns/pkg-descr
@@ -1,16 +1,16 @@
 From libfiredns(3):
 
-libfiredns is a library for handling asynchronous DNS
+"libfiredns is a library for handling asynchronous DNS
 requests.  It provides a very simple interface for sending
 requests and parsing reponses, as well as low-timeout
 blocking functions.  It can also be compiled to override
 the BIND/LIBC functions with its alternative implementations.
 libfiredns functions have much lower timeouts than the stock
 functions and tend to be faster because they send requests
-to all configured system nameservers at the same time.
+to all configured system nameservers at the same time."
 
 WWW: http://ares.penguinhosting.net/~ian/
 
 - Dean
 
 dean@odyssey.apana.org.au
diff --git a/dns/firedns/pkg-plist b/dns/firedns/pkg-plist
index b5c12b1473d2..7aceb28be2c0 100644
--- a/dns/firedns/pkg-plist
+++ b/dns/firedns/pkg-plist
@@ -1,5 +1,8 @@
 @comment $FreeBSD$
 include/firedns.h
 lib/libfiredns.so
 lib/libfiredns.so.0
 lib/libfiredns.a
+bin/fdnsip
+bin/fdnstxt
+bin/fdnsname
diff --git a/misc/firestring/Makefile b/misc/firestring/Makefile
index 8f4fe5820509..388a62c4bc64 100644
--- a/misc/firestring/Makefile
+++ b/misc/firestring/Makefile
@@ -1,49 +1,50 @@
 # New ports collection makefile for:	firestring
 # Date created:		Mon 13 May 14:30:00 WST 2002
 # Whom:			Dean Hollister <dean@odyssey.apana.org.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	firestring
-PORTVERSION=	0.1.21
-CATEGORIES=	misc net
+PORTVERSION=	0.1.22
+CATEGORIES=	misc net devel
 MASTER_SITES=	http://ares.penguinhosting.net/~ian/projects/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
 		ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	-${PORTVERSION}.tar.gz
 
 MAINTAINER=	dean@odyssey.apana.org.au
 
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN3=		firestring_chomp.3 firestring_chug.3 firestring_concat.3 \
 		firestring_conf_add.3 firestring_conf_find.3 \
 		firestring_conf_find_next.3 firestring_conf_free.3 \
 		firestring_conf_parse.3 firestring_estr_0.3 \
 		firestring_estr_alloc.3 firestring_estr_base64_decode.3 \
 		firestring_estr_base64_encode.3 firestring_estr_ends.3 \
 		firestring_estr_estrcasecmp.3 firestring_estr_estrcat.3 \
 		firestring_estr_estrcmp.3 firestring_estr_estrcpy.3 \
-		firestring_estr_estristr.3 firestring_estr_estrncasecmp.3 \
-		firestring_estr_estrstr.3 firestring_estr_expand.3 \
-		firestring_estr_free.3 firestring_estr_read.3 \
-		firestring_estr_sprintf.3 firestring_estr_starts.3 \
-		firestring_estr_strcasecmp.3 firestring_estr_strcat.3 \
-		firestring_estr_strchr.3 firestring_estr_strcmp.3 \
-		firestring_estr_strcpy.3 firestring_estr_stristr.3 \
-		firestring_estr_strstr.3 firestring_estr_xml_decode.3 \
+		firestring_estr_estristr.3 \
+		firestring_estr_estrncasecmp.3 firestring_estr_estrstr.3 \
+		firestring_estr_expand.3 firestring_estr_free.3 \
+		firestring_estr_read.3 firestring_estr_sprintf.3 \
+		firestring_estr_starts.3 firestring_estr_strcasecmp.3 \
+		firestring_estr_strcat.3 firestring_estr_strchr.3 \
+		firestring_estr_strcmp.3 firestring_estr_strcpy.3 \
+		firestring_estr_stristr.3 firestring_estr_strstr.3 \
+		firestring_estr_xml_decode.3 \
 		firestring_estr_xml_encode.3 firestring_hextoi.3 \
 		firestring_malloc.3 firestring_realloc.3 \
 		firestring_snprintf.3 firestring_strcasecmp.3 \
 		firestring_strdup.3 firestring_strncasecmp.3 \
 		firestring_strncat.3 firestring_strncpy.3 \
 		libfirestring.3
 
 post-install:
 	@cd ${PREFIX}/lib; ${MV} libfirestring.so libfirestring.so.0; \
 	${LN} -s libfirestring.so.0 libfirestring.so
 
 .include <bsd.port.mk>
diff --git a/misc/firestring/distinfo b/misc/firestring/distinfo
index d1ddc3585867..e7c8298c116d 100644
--- a/misc/firestring/distinfo
+++ b/misc/firestring/distinfo
@@ -1 +1 @@
-MD5 (firestring-0.1.21.tar.gz) = 24373e9973406af7dae65414534e4bed
+MD5 (firestring-0.1.22.tar.gz) = c9e65fa76d1fffcd01d8052ba4231616
diff --git a/misc/firestring/files/patch-configure b/misc/firestring/files/patch-configure
index 45cd38f77814..c5905d7a7b1a 100644
--- a/misc/firestring/files/patch-configure
+++ b/misc/firestring/files/patch-configure
@@ -1,56 +1,65 @@
 --- configure.orig	Sun Sep 22 06:37:40 2002
-+++ configure	Tue Oct 15 17:22:58 2002
++++ configure	Thu Oct 31 12:44:24 2002
 @@ -322,7 +322,7 @@
  $ECHO "INCLUDEDIR ?= \$(PREFIX)/include" >> Makefile
  $ECHO "MANDIR ?= \$(PREFIX)/man" >> Makefile
  $ECHO "CONFDIR ?= \$(PREFIX)/etc" >> Makefile
 -$ECHO "INSTALL_GROUP ?= root" >> Makefile
 +$ECHO "INSTALL_GROUP ?= wheel" >> Makefile
  $ECHO "INSTALL_USER ?= root" >> Makefile
  
  $ECHO "LIBS := \$(LIBS) $INLIBS" >> Makefile
 @@ -517,7 +517,7 @@
  $ECHO "done"
  for BINARY in $BINARIES; do
  	$ECHO -n "	adding rule to install binary $BINARY..."
 -	$ECHO "	./install.sh $BINARY \$(BINDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
 +	$ECHO "	./install.sh $BINARY \$(PREFIX)/bin \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
 @@ -527,7 +527,7 @@
  $ECHO "done"
  for LIBRARY in $STATIC; do
  	$ECHO -n "	adding rule to install static library $LIBRARY..."
 -	$ECHO "	./install.sh $LIBRARY \$(LIBDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
 +	$ECHO "	./install.sh $LIBRARY \$(PREFIX)/lib \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
 @@ -537,7 +537,7 @@
  $ECHO "done"
  for LIBRARY in $SHARED; do
  	$ECHO -n "	adding rule to install shared library $LIBRARY..."
 -	$ECHO "	./install.sh $LIBRARY \$(LIBDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
 +	$ECHO "	./install.sh $LIBRARY \$(PREFIX)/lib \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
+@@ -556,7 +556,7 @@
+ $ECHO "install-headers: $HEADERS" >> Makefile
+ for HEADER in $HEADERS; do
+ 	$ECHO -n "	adding rule to install header $HEADER..."
+-	$ECHO "	./install.sh $HEADER \$(INCLUDEDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
++	$ECHO "	./install.sh $HEADER \$(PREFIX)/include \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
+ 	$ECHO "done"
+ done;
+ $ECHO >> Makefile
 @@ -569,7 +569,7 @@
  	if test "$LS" != ""; then
  		$ECHO $LS >> Makefile
  		for MANPAGE in $LS; do
 -			$ECHO "	./install.sh $MANPAGE \$(MANDIR)/man$SECTION \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
 +			$ECHO "	./install.sh $MANPAGE \$(PREFIX)/man/man$SECTION \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
  		done;
  		$ECHO "done"
  	else
 @@ -596,7 +596,7 @@
  	done
  	$ECHO >> Makefile
  	for CONF in $CONFS; do
 -		$ECHO "	if test ! -f \$(CONFDIR)/$CONF; then ./install.sh conf/$CONF \$(CONFDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0644; fi" >> Makefile
 +		$ECHO "	if test ! -f \$(PREFIX)/etc/$CONF; then ./install.sh conf/$CONF \$(PREFIX)/etc \$(INSTALL_USER) \$(INSTALL_GROUP) 0644; fi" >> Makefile
  	done
  	$ECHO "done"
  else
diff --git a/misc/firestring/pkg-comment b/misc/firestring/pkg-comment
index 1ea9624a3db5..7446573a9866 100644
--- a/misc/firestring/pkg-comment
+++ b/misc/firestring/pkg-comment
@@ -1 +1 @@
-A library that provides maximum length aware string handling functions
+A library to make string handling easier in C
diff --git a/net/firedns/Makefile b/net/firedns/Makefile
index 4a8e9c5a4815..58ae91659f8c 100644
--- a/net/firedns/Makefile
+++ b/net/firedns/Makefile
@@ -1,37 +1,37 @@
 # New ports collection makefile for:	firedns
 # Date created:		Sun 12 May 22:30:00 WST 2002
 # Whom:			Dean Hollister <dean@odyssey.apana.org.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	firedns
-PORTVERSION=	0.1.29
-CATEGORIES=	net
+PORTVERSION=	0.1.30
+CATEGORIES=	net devel
 MASTER_SITES=	http://ares.penguinhosting.net/~ian/projects/ \
 		http://www.wa.apana.org.au/~dean/sources/ \
 		ftp://ftp.wa.apana.org.au/pub/pc/unix/packages/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	-${PORTVERSION}.tar.gz
 
 MAINTAINER=	dean@odyssey.apana.org.au
 
 BUILD_DEPENDS=	${LOCALBASE}/include/firestring.h:${PORTSDIR}/misc/firestring
 
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN3=		firedns_aton4.3 firedns_aton6.3 firedns_dnsbl_lookup.3 \
 		firedns_getip4.3 firedns_getip6.3 firedns_getmx.3 \
 		firedns_getname4.3 firedns_getname6.3 \
-		firedns_getresult.3 firedns_gettxt.3 \
-		firedns_ntoa4.3 firedns_ntoa6.3 firedns_resolveip4.3 \
-		firedns_resolveip6.3 firedns_resolvemx.3 \
+		firedns_getresult.3 firedns_gettxt.3 firedns_ntoa4.3 \
+		firedns_ntoa6.3 firedns_resolveip4.3 \
+		firedns_resolveip6.3  firedns_resolvemx.3 \
 		firedns_resolvename4.3 firedns_resolvename6.3 \
 		firedns_resolvetxt.3 libfiredns.3
 
 post-install:
 	@cd ${PREFIX}/lib; ${MV} libfiredns.so libfiredns.so.0; \
 	${LN} -s libfiredns.so.0 libfiredns.so
 
 .include <bsd.port.mk>
diff --git a/net/firedns/distinfo b/net/firedns/distinfo
index a7731a8e550d..b453abf7ff97 100644
--- a/net/firedns/distinfo
+++ b/net/firedns/distinfo
@@ -1 +1 @@
-MD5 (firedns-0.1.29.tar.gz) = 66b755377a04af143e7ced0e5c4cfd0d
+MD5 (firedns-0.1.30.tar.gz) = 0e18e14615036555183ee01b43fffd3c
diff --git a/net/firedns/files/patch-configure b/net/firedns/files/patch-configure
index 23357d52e6af..14470444fc3a 100644
--- a/net/firedns/files/patch-configure
+++ b/net/firedns/files/patch-configure
@@ -1,73 +1,78 @@
---- configure.orig	Sun Sep  1 05:15:24 2002
-+++ configure	Tue Oct 15 16:39:59 2002
-@@ -538,29 +538,29 @@
+--- configure.orig	Thu Oct 31 09:47:26 2002
++++ configure	Thu Oct 31 10:30:36 2002
+@@ -534,33 +534,33 @@
+ 
+ $ECHO -n "	adding rule to install binaries..."
+ $ECHO "install-binaries: $BINARIES" >> Makefile
+-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(BINDIR)" >> Makefile
++$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/bin" >> Makefile
  $ECHO "done"
  for BINARY in $BINARIES; do
  	$ECHO -n "	adding rule to install binary $BINARY..."
 -	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(BINDIR)" >> Makefile
 +	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(PREFIX)/bin" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
  
  $ECHO -n "	adding rule to install static libraries..."
  $ECHO "install-static: $STATIC" >> Makefile
 -$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
 +$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
  $ECHO "done"
  for LIBRARY in $STATIC; do
  	$ECHO -n "	adding rule to install static library $LIBRARY..."
 -	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
 +	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
  
  $ECHO -n "	adding rule to install shared libraries..."
  $ECHO "install-shared: $STATIC" >> Makefile
 -$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
 +$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
  $ECHO "done"
  for LIBRARY in $SHARED; do
  	$ECHO -n "	adding rule to install shared library $LIBRARY..."
 -	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
 +	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
 @@ -577,10 +577,10 @@
  	$ECHO "no firemake.headers found"
  fi
  $ECHO "install-headers: $HEADERS" >> Makefile
 -$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(INCLUDEDIR)" >> Makefile
 +$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/include" >> Makefile
  for HEADER in $HEADERS; do
  	$ECHO -n "	adding rule to install header $HEADER..."
 -	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(INCLUDEDIR)" >> Makefile
 +	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(PREFIX)/include" >> Makefile
  	$ECHO "done"
  done;
  $ECHO >> Makefile
 @@ -592,8 +592,8 @@
  	LS=`ls man/*.$SECTION 2>>configure.log`
  	if test "$LS" != ""; then
  		$ECHO "man/*.$SECTION" >> Makefile
 -		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(MANDIR)/man$SECTION" >> Makefile
 -		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(MANDIR)/man$SECTION" >> Makefile
 +		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/man/man$SECTION" >> Makefile
 +		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(PREFIX)/man/man$SECTION" >> Makefile
  		$ECHO "done"
  	else
  		$ECHO >> Makefile
 @@ -618,9 +618,9 @@
  		$ECHO -n "conf/$CONF " >> Makefile
  	done
  	$ECHO >> Makefile
 -	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(CONFDIR)" >> Makefile
 +	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/etc" >> Makefile
  	for CONF in $CONFS; do
 -		$ECHO "	if test ! -f \$(CONFDIR)/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(CONFDIR); fi" >> Makefile
 +		$ECHO "	if test ! -f \$(PREFIX)/etc/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(PREFIX)/etc; fi" >> Makefile
  	done
  	$ECHO "done"
  else
diff --git a/net/firedns/pkg-comment b/net/firedns/pkg-comment
index 3ee42f86ba17..33c130fb9958 100644
--- a/net/firedns/pkg-comment
+++ b/net/firedns/pkg-comment
@@ -1 +1 @@
-Library for handling asynchronous DNS requests
+A C library for handling asynchronous DNS queries
diff --git a/net/firedns/pkg-descr b/net/firedns/pkg-descr
index 31f4d4231fe0..5e0d9ebe9c66 100644
--- a/net/firedns/pkg-descr
+++ b/net/firedns/pkg-descr
@@ -1,16 +1,16 @@
 From libfiredns(3):
 
-libfiredns is a library for handling asynchronous DNS
+"libfiredns is a library for handling asynchronous DNS
 requests.  It provides a very simple interface for sending
 requests and parsing reponses, as well as low-timeout
 blocking functions.  It can also be compiled to override
 the BIND/LIBC functions with its alternative implementations.
 libfiredns functions have much lower timeouts than the stock
 functions and tend to be faster because they send requests
-to all configured system nameservers at the same time.
+to all configured system nameservers at the same time."
 
 WWW: http://ares.penguinhosting.net/~ian/
 
 - Dean
 
 dean@odyssey.apana.org.au
diff --git a/net/firedns/pkg-plist b/net/firedns/pkg-plist
index b5c12b1473d2..7aceb28be2c0 100644
--- a/net/firedns/pkg-plist
+++ b/net/firedns/pkg-plist
@@ -1,5 +1,8 @@
 @comment $FreeBSD$
 include/firedns.h
 lib/libfiredns.so
 lib/libfiredns.so.0
 lib/libfiredns.a
+bin/fdnsip
+bin/fdnstxt
+bin/fdnsname