diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 9642ca31c2d0..8f698b767d5b 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	racoon2
-PORTVERSION=	20051102a
-PORTREVISION=	3
+PORTVERSION=	20060712a
 CATEGORIES=	security net ipv6
-MASTER_SITES=	ftp://ftp.kame.net/pub/racoon2/
+MASTER_SITES=	ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sumikawa@FreeBSD.org
@@ -45,11 +44,11 @@ PLIST_SUB+=	KINK="@comment "
 .endif
 
 .if !defined(NOPORTDOCS)
-PORTDOCS+=	INSTALL USAGE USAGE.iked USAGE.spmd config-usage.ja.txt
-PORTDOCS+=	config-usage.txt iked-memo.ja.txt libracoon.ja.txt
-PORTDOCS+=	specification.ja.txt spmif.txt style.txt system-message.ja.txt
+PORTDOCS+=	INSTALL USAGE config-usage.ja.txt config-usage.txt
+PORTDOCS+=	iked-memo.ja.txt libracoon.ja.txt specification.ja.txt
+PORTDOCS+=	spmif.txt style.txt system-message.ja.txt
 .if defined (WITH_KINK)
-PORTDOCS+=	USAGE.kinkd kinkd-data-struct.obj kinkd-impl.ja.txt
+PORTDOCS+=	kinkd-data-struct.obj kinkd-impl.ja.txt
 PORTDOCS+=	kinkd-install.ja.txt kinkd-state-txn.obj
 .endif
 .endif
diff --git a/security/racoon2/distinfo b/security/racoon2/distinfo
index c00c98bd6e60..6c2f9f52683e 100644
--- a/security/racoon2/distinfo
+++ b/security/racoon2/distinfo
@@ -1,3 +1,3 @@
-MD5 (racoon2-20051102a.tgz) = 6e02a7992e8f0163dcc3ac9e0df4d603
-SHA256 (racoon2-20051102a.tgz) = 64c7dda5236178bab15f2d91fa30e0487bbbfe31df0e18e44c2bf93b1fc85c8d
-SIZE (racoon2-20051102a.tgz) = 691310
+MD5 (racoon2-20060712a.tgz) = 50f9d66a136d80b7f07f67566f4da74d
+SHA256 (racoon2-20060712a.tgz) = 5635f825fe59da02a76b8e38b4ac8a99fd5b0b856c5c3ca953b99d004014bc35
+SIZE (racoon2-20060712a.tgz) = 714616
diff --git a/security/racoon2/files/patch-pskgen-Makefile.in b/security/racoon2/files/patch-pskgen-Makefile.in
index b24cb2f81908..8d5beb595351 100644
--- a/security/racoon2/files/patch-pskgen-Makefile.in
+++ b/security/racoon2/files/patch-pskgen-Makefile.in
@@ -1,11 +1,11 @@
---- pskgen/Makefile.in~	Thu Jul 14 17:30:23 2005
-+++ pskgen/Makefile.in	Tue Nov  1 21:46:08 2005
-@@ -16,7 +16,7 @@
+--- pskgen/Makefile.in.orig	Tue Nov  8 05:53:51 2005
++++ pskgen/Makefile.in	Sat Jul 15 17:48:57 2006
+@@ -18,7 +18,7 @@
  
  install: all
  	$(INSTALL) -d $(sbindir)
--	$(INSTALL) -m 555 $(PROG) $(sbindir)
-+	$(INSTALL_SCRIPT) -m 555 $(PROG) $(sbindir)
- 	$(INSTALL) -m 444 $(PROG).8 $(mandir)/man8
+-	$(INSTALL_PROGRAM) $(PROG) $(sbindir)
++	$(INSTALL_SCRIPT) $(PROG) $(sbindir)
+ 	$(INSTALL_DATA) $(PROG).8 $(mandir)/man8
  
  depend:
diff --git a/security/racoon2/files/patch-samples-Makefile.in b/security/racoon2/files/patch-samples-Makefile.in
index 96bc48d6568d..0400668aea7a 100644
--- a/security/racoon2/files/patch-samples-Makefile.in
+++ b/security/racoon2/files/patch-samples-Makefile.in
@@ -1,18 +1,18 @@
---- samples/Makefile.in.orig	Fri Oct 28 12:49:37 2005
-+++ samples/Makefile.in	Wed Jun  7 15:31:23 2006
-@@ -17,10 +17,11 @@
+--- samples/Makefile.in.orig	Tue Nov  8 05:53:50 2005
++++ samples/Makefile.in	Sat Jul 15 17:50:25 2006
+@@ -18,10 +18,11 @@
  
  install-startup-rc-d:
  	$(INSTALL) -d $(sysconfdir)/rc.d
--	$(INSTALL) rc.d-iked $(sysconfdir)/rc.d/iked
--	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd
--	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd
--	$(INSTALL) rc.d-racoon2 $(sysconfdir)/rc.d/racoon2
-+	$(INSTALL) rc.d-iked $(sysconfdir)/rc.d/iked.sh
+-	$(INSTALL_SCRIPT) rc.d-iked $(sysconfdir)/rc.d/iked
+-	$(INSTALL_SCRIPT) rc.d-kinkd $(sysconfdir)/rc.d/kinkd
+-	$(INSTALL_SCRIPT) rc.d-spmd $(sysconfdir)/rc.d/spmd
+-	$(INSTALL_SCRIPT) rc.d-racoon2 $(sysconfdir)/rc.d/racoon2
++	$(INSTALL_SCRIPT) rc.d-iked $(sysconfdir)/rc.d/iked.sh
 +.if defined (WITH_KINK)
-+	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd.sh
++	$(INSTALL_SCRIPT) rc.d-kinkd $(sysconfdir)/rc.d/kinkd.sh
 +.endif
-+	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd.sh
++	$(INSTALL_SCRIPT) rc.d-spmd $(sysconfdir)/rc.d/spmd.sh
  
  install-startup-init-d:
  	$(INSTALL) -d $(sysconfdir)/init.d
diff --git a/security/racoon2/files/patch-samples-rc.d-kinkd.in b/security/racoon2/files/patch-samples-rc.d-kinkd.in
new file mode 100644
index 000000000000..a15efa66c8d1
--- /dev/null
+++ b/security/racoon2/files/patch-samples-rc.d-kinkd.in
@@ -0,0 +1,11 @@
+--- samples/rc.d-kinkd.in~	Sun Jul 16 00:23:47 2006
++++ samples/rc.d-kinkd.in	Tue Jul 18 01:20:34 2006
+@@ -17,7 +17,7 @@
+ rcvar=`set_rcvar`
+ command="@sbindir@/${name}"
+ extra_commands="reload"
+-required_vars="spmd"
++required_vars="spmd_enable"
+ pidfile="/var/run/${name}.pid"
+ required_files="@sysconfdir@/racoon2.conf"
+