diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index ff2a14169f6..e42d06ad988 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.39 2008/04/22 00:34:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.40 2008/04/22 20:24:10 sthen Exp $
 
 COMMENT=	Secure Internet Live Conferencing (SILC) server
 
-DISTNAME=	silc-server-1.1.5
+DISTNAME=	silc-server-1.1.6
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.silcnet.org/
@@ -18,11 +18,8 @@ WANTLIB=		c pthread
 
 MASTER_SITES=	http://ftp.silcnet.org/server/sources/ \
 		ftp://ftp.silcnet.org/silc/server/sources/ \
-		http://www.planetmirror.com/pub/silcnet/server/sources/ \
-		http://munitions.vipul.net/software/mirrors/silc/server/sources/ \
 		ftp://ftp.no.silcnet.org/pub/silc/server/sources/ \
-		http://the.wiretapped.net/security/network-security/silc/server/sources/ \
-		ftp://ftp.wiretapped.net/pub/security/network-security/silc/server/sources/
+		http://the.wiretapped.net/security/network-security/silc/server/sources/
 
 MODULES=	converters/libiconv
 
diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo
index c5e57f6939d..021b666627b 100644
--- a/net/silc-server/distinfo
+++ b/net/silc-server/distinfo
@@ -1,5 +1,5 @@
-MD5 (silc-server-1.1.5.tar.gz) = f63slTofRV2cbkwWupPGHw==
-RMD160 (silc-server-1.1.5.tar.gz) = 66rlwXAp0j83Y7neVFn8ZP6dn18=
-SHA1 (silc-server-1.1.5.tar.gz) = /l8WydoUxTOjv6gAGb9PnNYgFuk=
-SHA256 (silc-server-1.1.5.tar.gz) = IRnYpfZXPnGmH6ROoaLwx/sOMTcGhm4B++xv2UYsR4Q=
-SIZE (silc-server-1.1.5.tar.gz) = 1197209
+MD5 (silc-server-1.1.6.tar.gz) = 0x+0KSQNUCmD5LLl9qUrOA==
+RMD160 (silc-server-1.1.6.tar.gz) = bbPxlI9NcJEB/uFrbBbqp8wiYSY=
+SHA1 (silc-server-1.1.6.tar.gz) = iNkKwsvpE3JVBQOkFZXtntZTGNY=
+SHA256 (silc-server-1.1.6.tar.gz) = qrZ9Fa+/1d7QIs//BwFAY5DwFASWfHbhN4frbSuc2EY=
+SIZE (silc-server-1.1.6.tar.gz) = 1197116
diff --git a/net/silc-server/patches/patch-apps_silcd_server_c b/net/silc-server/patches/patch-apps_silcd_server_c
deleted file mode 100644
index 98d28452868..00000000000
--- a/net/silc-server/patches/patch-apps_silcd_server_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-apps_silcd_server_c,v 1.1 2008/04/22 00:34:30 sthen Exp $
-http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff;h=e10fb3ff712f60100846064c196d5f69921d1b43
---- apps/silcd/server.c.orig	Sun Apr 20 21:20:39 2008
-+++ apps/silcd/server.c	Sun Apr 20 21:21:19 2008
-@@ -3036,7 +3036,8 @@ void silc_server_free_sock_user_data(SilcServer server
-   if (!idata)
-     return;
- 
--  //  silc_schedule_task_del_by_context(server->schedule, sock);
-+  silc_schedule_task_del_by_all(server->schedule, 0, silc_server_do_rekey,
-+                               sock);
- 
-   /* Cancel active protocols */
-   if (idata) {