diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile
index 2ee817b9d083..c66a66fc3a9a 100644
--- a/net-mgmt/rancid/Makefile
+++ b/net-mgmt/rancid/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rancid
-PORTVERSION=	2.3.1
-PORTREVISION=	3
+PORTVERSION=	2.3.2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 
@@ -22,20 +21,22 @@ RUN_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel \
 USE_PERL5=	yes
 SUB_FILES=	pkg-message
 USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=			\
-		--prefix=${PREFIX}/ \
 		--localstatedir=${PREFIX}/var/${PORTNAME}/ \
 		--bindir=${PREFIX}/libexec/${PORTNAME}/ \
 		--sysconfdir=${PREFIX}/etc/${PORTNAME}/
 
-MAN1=		alogin.1 blogin.1 cat5rancid.1 clogin.1 control_rancid.1 \
-		cssrancid.1 elogin.1 erancid.1 f10rancid.1 flogin.1 fnrancid.1 \
-		francid.1 hlogin.1 hrancid.1 htlogin.1 htrancid.1 jerancid.1 \
-		jlogin.1 jrancid.1 lg_intro.1 mrancid.1 nlogin.1 nrancid.1 \
-		nslogin.1 nsrancid.1 par.1 prancid.1 rancid-cvs.1 rancid-run.1 \
-		rancid.1 rancid_intro.1 rivlogin.1 rivrancid.1 tntlogin.1 \
-		tntrancid.1 xrancid.1 zrancid.1
+MAN1=		agmrancid.1 alogin.1 arancid.1 avologin.1 avorancid.1 \
+		blogin.1 brancid.1 cat5rancid.1 clogin.1 \
+		control_rancid.1 cssrancid.1 elogin.1 erancid.1 f10rancid.1 \
+		f5rancid.1 flogin.1 fnrancid.1 francid.1 hlogin.1 hrancid.1 \
+		htlogin.1 htrancid.1 jerancid.1 jlogin.1 jrancid.1 lg_intro.1 \
+		mrancid.1 nlogin.1 nrancid.1 nslogin.1 nsrancid.1 nxrancid.1 \
+		par.1 prancid.1 rancid-cvs.1 rancid-run.1 rancid.1 \
+		rancid_intro.1 rivlogin.1 rivrancid.1 \
+		rrancid.1 srancid.1 tlogin.1 tntlogin.1 tntrancid.1 trancid.1 \
+		xrancid.1 zrancid.1
 
 MAN5=		lg.conf.5 cloginrc.5 rancid.conf.5 router.db.5
 
@@ -46,7 +47,7 @@ NEWERCONFIG_FILES2=	etc/lg.conf
 NEWCONFIG_FILES=	rancid.conf lg.conf
 
 pre-everything::
-	@ ${ECHO} "Make sure your rancid repository is quit before upgrading; disable rancid cron jobs"
+	@ ${ECHO} "Make sure your rancid repository is quite before upgrading; disable rancid cron jobs"
 
 post-install:
 	${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${PREFIX}/bin
diff --git a/net-mgmt/rancid/distinfo b/net-mgmt/rancid/distinfo
index fed6b2420ee6..8207079c6f9d 100644
--- a/net-mgmt/rancid/distinfo
+++ b/net-mgmt/rancid/distinfo
@@ -1,3 +1,3 @@
-MD5 (rancid-2.3.1.tar.gz) = b188595e528515b4f87078f63936d355
-SHA256 (rancid-2.3.1.tar.gz) = 32ceca2bbedf92577fbe780dd2b6c7d7a012974728e4932ce6a19897907dc2fa
-SIZE (rancid-2.3.1.tar.gz) = 276562
+MD5 (rancid-2.3.2.tar.gz) = 4e2de3ff6850b311c0e2a442f7ae5d82
+SHA256 (rancid-2.3.2.tar.gz) = 7601fe0fe703a3f7336076414216214ccc588510ecc7b7752a2e277e83b6a179
+SIZE (rancid-2.3.2.tar.gz) = 341919
diff --git a/net-mgmt/rancid/files/patch-etc::Makefile.am b/net-mgmt/rancid/files/patch-etc::Makefile.am
index 67a61d8b98e0..6a967375cf8d 100644
--- a/net-mgmt/rancid/files/patch-etc::Makefile.am
+++ b/net-mgmt/rancid/files/patch-etc::Makefile.am
@@ -1,34 +1,34 @@
 
 $FreeBSD$
 
---- etc/Makefile.am.orig	Tue Jan 13 19:02:00 2004
-+++ etc/Makefile.am	Wed May  5 16:36:40 2004
+--- etc/Makefile.am.orig
++++ etc/Makefile.am
 @@ -33,26 +33,8 @@
  endif
  
  install-data-local: all
 -	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
--	if test -f $(sysconfdir)/rancid.conf ; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \
 -	    echo ""; \
--	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
 -	    echo "         *** examples."; \
 -	    echo ""; \
 -	else \
--	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	    $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \
 -	fi; \
--	if test -f $(sysconfdir)/lg.conf ; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \
 -	    echo ""; \
--	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
 -	    echo "         *** examples."; \
 -	    echo ""; \
 -	else \
--	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	    $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \
 -	fi; \
 -	fi
-+	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/ 
-+	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
++	$(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)
  
  #clean:
  #	rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)
diff --git a/net-mgmt/rancid/files/patch-etc::Makefile.in b/net-mgmt/rancid/files/patch-etc::Makefile.in
index f5c70a4d9d68..66e8a0709bb2 100644
--- a/net-mgmt/rancid/files/patch-etc::Makefile.in
+++ b/net-mgmt/rancid/files/patch-etc::Makefile.in
@@ -1,34 +1,34 @@
 
 $FreeBSD$
 
---- etc/Makefile.in.orig	Fri Feb  6 16:56:50 2004
-+++ etc/Makefile.in	Wed May  5 16:40:00 2004
-@@ -347,26 +347,8 @@
+--- etc/Makefile.in.orig
++++ etc/Makefile.in
+@@ -375,26 +375,8 @@
  
  
  install-data-local: all
 -	@if test "$(DO_CONF_INSTALL)" = "yes"; then \
--	if test -f $(sysconfdir)/rancid.conf ; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \
 -	    echo ""; \
--	    echo "WARNING: *** $(sysconfdir)/rancid.conf exists.  See "; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/rancid.conf.sample for new"; \
 -	    echo "         *** examples."; \
 -	    echo ""; \
 -	else \
--	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \
+-	    $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \
 -	fi; \
--	if test -f $(sysconfdir)/lg.conf ; then \
+-	if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \
 -	    echo ""; \
--	    echo "WARNING: *** $(sysconfdir)/lg.conf exists.  See "; \
+-	    echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists.  See "; \
 -	    echo "         *** $(pkgdatadir)/lg.conf.sample for new"; \
 -	    echo "         *** examples."; \
 -	    echo ""; \
 -	else \
--	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \
+-	    $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \
 -	fi; \
 -	fi
-+	    $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/
-+	    $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/
++	$(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)
  
  lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in
  	rm -f lg.conf.sample lg.conf.sample.tmp; \
diff --git a/net-mgmt/rancid/pkg-plist b/net-mgmt/rancid/pkg-plist
index cfaa5f1dc569..d960f61bafe9 100644
--- a/net-mgmt/rancid/pkg-plist
+++ b/net-mgmt/rancid/pkg-plist
@@ -5,6 +5,9 @@ bin/rancid-cvs
 bin/rancid-run
 libexec/rancid/alogin
 libexec/rancid/arancid
+libexec/rancid/avologin
+libexec/rancid/avorancid
+libexec/rancid/agmrancid
 libexec/rancid/blogin
 libexec/rancid/brancid
 libexec/rancid/cat5rancid
@@ -14,6 +17,7 @@ libexec/rancid/cssrancid
 libexec/rancid/elogin
 libexec/rancid/erancid
 libexec/rancid/f10rancid
+libexec/rancid/f5rancid
 libexec/rancid/flogin
 libexec/rancid/fnrancid
 libexec/rancid/francid
@@ -28,8 +32,11 @@ libexec/rancid/jrancid
 libexec/rancid/lg.cgi
 libexec/rancid/lgform.cgi
 libexec/rancid/mrancid
+libexec/rancid/mrvlogin
+libexec/rancid/mrvrancid
 libexec/rancid/nlogin
 libexec/rancid/nrancid
+libexec/rancid/nxrancid
 libexec/rancid/nslogin
 libexec/rancid/nsrancid
 libexec/rancid/par
@@ -41,6 +48,9 @@ libexec/rancid/rancid-run
 libexec/rancid/rivlogin
 libexec/rancid/rivrancid
 libexec/rancid/rrancid
+libexec/rancid/srancid
+libexec/rancid/tlogin
+libexec/rancid/trancid
 libexec/rancid/tntlogin
 libexec/rancid/tntrancid
 libexec/rancid/xrancid