diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index 4b92cbc725d7..a195ffd5a45c 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -6,35 +6,30 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7
 CATEGORIES=	devel net security
-MASTER_SITES=	http://www.silcnet.org/download/ \
-		ftp://ftp.silcnet.org/pub/silc/ \
-		http://ftp.silcnet.org/ \
+MASTER_SITES=	http://www.silcnet.org/download/toolkit/sources/ \
+		ftp://ftp.silcnet.org/silc/toolkit/sources/ \
+		http://www.planetmirror.com/pub/silcnet/toolkit/sources / \
+		ftp://ftp.au.silcnet.org/pub/silcnet/toolkit/sources/ \
+		http://the.wiretapped.net/security/network-security/silc/toolkit/sources/ \
+		ftp://ftp.wiretapped.net/pub/security/network-security/silc/toolkit/sources/ \
 		http://munitions.vipul.net/software/mirrors/silc/ \
-		ftp://ftp.wiretapped.net/pub/security/network-security/silc/ \
-		http://www.au.silcnet.org/download/ \
-		ftp://ftp.au.silcnet.org/pub/silcnet/ \
-		http://www.planetmirror.com/pub/silcnet/ \
-		http://the.wiretapped.net/security/network-security/silc/ \
-		ftp://ftp.wiretapped.net/pub/security/network-security/silc/ \
-		http://www.no.silcnet.org/download/ \
-		ftp://ftp.no.silcnet.org/pub/silc/
+		ftp://ftp.no.silcnet.org/pub/silc/toolkit/sources/
 PKGNAMESUFFIX=	-toolkit
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 
-LIB_DEPENDS=	dotconf.0:${PORTSDIR}/devel/dotconf
 RUN_DEPENDS=	silc:${PORTSDIR}/net/silc-client
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GLIB=	yes
 CONFIGURE_ARGS=	--with-silcd-config-file=${PREFIX}/etc/${PORTNAME} \
-		--with-docdir=share/doc/${PORTNAME}${PKGNAMESUFFIX} \
+		--with-docdir=${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} \
 		--with-etcdir=${PREFIX}/etc/${PORTNAME} \
-		--with-helpdir=share/${PORTNAME}${PKGNAMESUFFIX}/help \
+		--with-helpdir=${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}/help \
 		--with-logsdir=${PORTNAME}/logs \
 		--with-simdir=libexec/${PORTNAME}/modules \
 		--includedir=${PREFIX}/include/${PORTNAME}
diff --git a/devel/silc-toolkit/distinfo b/devel/silc-toolkit/distinfo
index 3280e2155785..0089699e2bf0 100644
--- a/devel/silc-toolkit/distinfo
+++ b/devel/silc-toolkit/distinfo
@@ -1 +1 @@
-MD5 (silc-toolkit-0.6.1.tar.bz2) = a0c9cae418be63f75d9c290de6dc48d5
+MD5 (silc-toolkit-0.7.tar.bz2) = 4c8548e1297d0ae03416afbf3986d1dc
diff --git a/devel/silc-toolkit/files/patch-Makefile.in b/devel/silc-toolkit/files/patch-Makefile.in
index 1160f5ca1e34..17d81281323a 100644
--- a/devel/silc-toolkit/files/patch-Makefile.in
+++ b/devel/silc-toolkit/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Oct 23 02:36:24 2001
-+++ Makefile.in	Fri Nov  9 19:12:35 2001
-@@ -145,9 +145,9 @@
+--- Makefile.in.orig	Fri Dec 21 02:51:02 2001
++++ Makefile.in	Fri Dec 21 02:53:28 2001
+@@ -152,9 +152,9 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -8,12 +8,12 @@
 -SUBDIRS = lib irssi silc silcd doc includes win32
 -DIST_SUBDIRS = lib irssi silc silcd doc includes win32
 +COMMONDIRS = lib irssi doc includes
-+SUBDIRS = lib irssi doc includes win32
-+DIST_SUBDIRS = lib irssi doc includes win32
++SUBDIRS = lib irssi doc includes
++DIST_SUBDIRS = lib irssi doc includes
  
  #
  # INCLUDE defines
-@@ -511,11 +511,8 @@
+@@ -529,11 +529,8 @@
  	-rm -rf $(distdir)
  
  install-dirs:
@@ -25,22 +25,24 @@
  
  generate-server-key:
  	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -528,7 +525,8 @@
+@@ -546,7 +543,8 @@
  doc-install:
  	$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/
--	$(INSTALL_DATA) $(srcdir)/doc/example* $(docdir)/
+-	$(INSTALL_DATA) $(srcdir)/doc/example_* $(docdir)/
 +	$(INSTALL_DATA) $(srcdir)/doc/examples/* $(docdir)/
 +	$(INSTALL_DATA) $(srcdir)/doc/example*.conf $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/doc/*.txt $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
  	$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
-@@ -548,7 +546,7 @@
+@@ -566,8 +564,8 @@
  	  $(etcdir)/silc.conf; \
  	fi
  
--install-data-hook: install-dirs generate-server-key sim-install doc-install etc-install
-+install-data-hook: install-dirs sim-install doc-install
+-@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
+-@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install etc-install
++@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install
++@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs sim-install doc-install 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/devel/silc-toolkit/files/patch-configure b/devel/silc-toolkit/files/patch-configure
index ad444ce8c461..0d9cb1bf1393 100644
--- a/devel/silc-toolkit/files/patch-configure
+++ b/devel/silc-toolkit/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Nov  9 04:02:27 2001
-+++ configure	Fri Nov  9 04:02:43 2001
-@@ -8472,7 +8472,7 @@
+--- configure.orig	Fri Dec 21 02:53:47 2001
++++ configure	Fri Dec 21 02:54:02 2001
+@@ -12572,7 +12572,7 @@
        fi
        ;;
      *-freebsd2.2*)
diff --git a/devel/silc-toolkit/files/patch-irssi:Makefile.in b/devel/silc-toolkit/files/patch-irssi:Makefile.in
index 9506cdec7f7e..5418de8d6fc1 100644
--- a/devel/silc-toolkit/files/patch-irssi:Makefile.in
+++ b/devel/silc-toolkit/files/patch-irssi:Makefile.in
@@ -1,5 +1,5 @@
---- irssi/Makefile.in.orig	Fri Nov  9 18:23:24 2001
-+++ irssi/Makefile.in	Fri Nov  9 18:25:33 2001
+--- irssi/Makefile.in.orig	Fri Dec 21 02:55:17 2001
++++ irssi/Makefile.in	Fri Dec 21 02:55:28 2001
 @@ -486,7 +486,7 @@
  
  info-am:
diff --git a/devel/silc-toolkit/files/patch-lib:Makefile.in b/devel/silc-toolkit/files/patch-lib:Makefile.in
index acb3f48d5723..eb11852945a3 100644
--- a/devel/silc-toolkit/files/patch-lib:Makefile.in
+++ b/devel/silc-toolkit/files/patch-lib:Makefile.in
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	Fri Nov  9 01:18:20 2001
-+++ lib/Makefile.in	Fri Nov  9 01:18:29 2001
-@@ -116,7 +116,6 @@
+--- lib/Makefile.in.orig	Fri Dec 21 02:55:51 2001
++++ lib/Makefile.in	Fri Dec 21 02:56:04 2001
+@@ -123,7 +123,6 @@
  	silcutil \
  	silcclient \
  	silcsftp \
@@ -8,7 +8,7 @@
  	trq
  
  
-@@ -134,8 +133,7 @@
+@@ -141,8 +140,7 @@
  	silcske \
  	silcutil \
  	silcsftp \
diff --git a/devel/silc-toolkit/pkg-plist b/devel/silc-toolkit/pkg-plist
index dd68b895d3c3..3a4cd715666c 100644
--- a/devel/silc-toolkit/pkg-plist
+++ b/devel/silc-toolkit/pkg-plist
@@ -1,3 +1,4 @@
+bin/silc
 include/silc/aes.h
 include/silc/bitmove.h
 include/silc/blowfish.h
@@ -14,9 +15,6 @@ include/silc/mars.h
 include/silc/md5.h
 include/silc/mp_gmp.h
 include/silc/mp_mpi.h
-include/silc/mpi.h
-include/silc/mplogic.h
-include/silc/mpprime.h
 include/silc/none.h
 include/silc/payload.h
 include/silc/pkcs1.h
@@ -26,6 +24,7 @@ include/silc/rc6.h
 include/silc/rsa.h
 include/silc/sha1.h
 include/silc/silcapi.h
+include/silc/silcargument.h
 include/silc/silcauth.h
 include/silc/silcbuffer.h
 include/silc/silcbuffmt.h
@@ -50,7 +49,6 @@ include/silc/silcmutex.h
 include/silc/silcnet.h
 include/silc/silcnotify.h
 include/silc/silcpacket.h
-include/silc/silcpayload.h
 include/silc/silcpkcs.h
 include/silc/silcprivate.h
 include/silc/silcprotocol.h
@@ -116,6 +114,7 @@ share/silc-toolkit/help/disconnect
 share/silc-toolkit/help/echo
 share/silc-toolkit/help/eval
 share/silc-toolkit/help/exec
+share/silc-toolkit/help/file
 share/silc-toolkit/help/format
 share/silc-toolkit/help/getkey
 share/silc-toolkit/help/help