diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index a6ac14807697..9ce8bf88fc38 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	racoon
-PORTVERSION=	20020507a
-PORTREVISION=	1
+PORTVERSION=	20021120a
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
diff --git a/security/racoon/distinfo b/security/racoon/distinfo
index 4e7236ac4ee3..f697fafcc598 100644
--- a/security/racoon/distinfo
+++ b/security/racoon/distinfo
@@ -1 +1 @@
-MD5 (racoon-20020507a.tar.gz) = b09b26871e8b1f5feebc41a0f05f9819
+MD5 (racoon-20021120a.tar.gz) = a5b9ecdc9665fc71a1ead7c21db04d1d
diff --git a/security/racoon/files/patch-ab b/security/racoon/files/patch-ab
index 70206c12ebfe..e5fb29c03f60 100644
--- a/security/racoon/files/patch-ab
+++ b/security/racoon/files/patch-ab
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Tue Jun 13 14:01:41 2000
-+++ Makefile.in	Wed Jul  5 16:20:04 2000
+--- Makefile.in.orig	Fri Sep 27 07:04:59 2002
++++ Makefile.in	Thu Nov 21 22:28:50 2002
 @@ -7,7 +7,7 @@
  LDFLAGS=@LDFLAGS@
  CPPFLAGS=	@CPPFLAGS@
  OPTFLAG=@OPTFLAG@
--CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"${sysconfdir}\"
-+CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"${sysconfdir}/racoon\"
+-CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -DSYSCONFDIR=\"${sysconfdir}\"
++CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -DSYSCONFDIR=\"${sysconfdir}/racoon\"
  CFLAGS+=-DYY_NO_UNPUT
  CFLAGS+=-I${srcdir}/../libipsec
  LIBS=	@LIBS@
-@@ -79,10 +79,6 @@
+@@ -88,10 +88,6 @@
  	$(INSTALL) -o bin -g bin -m 444 racoon.conf.5 $(mandir)/man5
  	-mkdir -p ${sysconfdir}/racoon
  	for i in $(CONF); do \
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index a6ac14807697..9ce8bf88fc38 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	racoon
-PORTVERSION=	20020507a
-PORTREVISION=	1
+PORTVERSION=	20021120a
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
diff --git a/security/racoon2/distinfo b/security/racoon2/distinfo
index 4e7236ac4ee3..f697fafcc598 100644
--- a/security/racoon2/distinfo
+++ b/security/racoon2/distinfo
@@ -1 +1 @@
-MD5 (racoon-20020507a.tar.gz) = b09b26871e8b1f5feebc41a0f05f9819
+MD5 (racoon-20021120a.tar.gz) = a5b9ecdc9665fc71a1ead7c21db04d1d
diff --git a/security/racoon2/files/patch-ab b/security/racoon2/files/patch-ab
index 70206c12ebfe..e5fb29c03f60 100644
--- a/security/racoon2/files/patch-ab
+++ b/security/racoon2/files/patch-ab
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Tue Jun 13 14:01:41 2000
-+++ Makefile.in	Wed Jul  5 16:20:04 2000
+--- Makefile.in.orig	Fri Sep 27 07:04:59 2002
++++ Makefile.in	Thu Nov 21 22:28:50 2002
 @@ -7,7 +7,7 @@
  LDFLAGS=@LDFLAGS@
  CPPFLAGS=	@CPPFLAGS@
  OPTFLAG=@OPTFLAG@
--CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"${sysconfdir}\"
-+CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -Dss_family=__ss_family -Dss_len=__ss_len -DSYSCONFDIR=\"${sysconfdir}/racoon\"
+-CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -DSYSCONFDIR=\"${sysconfdir}\"
++CFLAGS=	@CFLAGS@ $(CPPFLAGS) @DEFS@ $(CPPFLAGS) $(OPTFLAG) -DIPSEC -I. -I$(srcdir) -DSYSCONFDIR=\"${sysconfdir}/racoon\"
  CFLAGS+=-DYY_NO_UNPUT
  CFLAGS+=-I${srcdir}/../libipsec
  LIBS=	@LIBS@
-@@ -79,10 +79,6 @@
+@@ -88,10 +88,6 @@
  	$(INSTALL) -o bin -g bin -m 444 racoon.conf.5 $(mandir)/man5
  	-mkdir -p ${sysconfdir}/racoon
  	for i in $(CONF); do \