diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index 8468d59ec53..74315cd87fc 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.45 2008/08/27 00:35:24 martynas Exp $
+# $OpenBSD: Makefile,v 1.46 2008/09/15 00:13:40 brad Exp $
 
 COMMENT=	Secure Internet Live Conferencing (SILC) server
 
-DISTNAME=	silc-server-1.1.11
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	silc-server-1.1.12
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.silcnet.org/
diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo
index 0295e9d7fda..fc0964d626c 100644
--- a/net/silc-server/distinfo
+++ b/net/silc-server/distinfo
@@ -1,5 +1,5 @@
-MD5 (silc-server-1.1.11.tar.gz) = COT4P38gExJgxhtjRA77zA==
-RMD160 (silc-server-1.1.11.tar.gz) = 1uS3xngCZUauvRidDD5VcRheRWA=
-SHA1 (silc-server-1.1.11.tar.gz) = QVddudTesDJnh/p0JKTaezd4oG8=
-SHA256 (silc-server-1.1.11.tar.gz) = 5xM3S0O0nN6Jheevbyu+kI6vbovAlTJzGSi/sVw+5go=
-SIZE (silc-server-1.1.11.tar.gz) = 1197969
+MD5 (silc-server-1.1.12.tar.gz) = Ee13QN8pQGBR1KiH3oenBg==
+RMD160 (silc-server-1.1.12.tar.gz) = r72yz1t0+3BONLS+yK7aLzv0bX8=
+SHA1 (silc-server-1.1.12.tar.gz) = nc3zUdNu0LUoRVX4MTGx4BJ5GAw=
+SHA256 (silc-server-1.1.12.tar.gz) = yHXaFd7rpMR/r6OcXvKuz0GjZya8QY9oRiajAdxy1K8=
+SIZE (silc-server-1.1.12.tar.gz) = 1199306
diff --git a/net/silc-server/patches/patch-doc_example_silcd_conf_in b/net/silc-server/patches/patch-doc_example_silcd_conf_in
index 5f3c297005e..1692952854d 100644
--- a/net/silc-server/patches/patch-doc_example_silcd_conf_in
+++ b/net/silc-server/patches/patch-doc_example_silcd_conf_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-doc_example_silcd_conf_in,v 1.7 2008/03/22 23:06:50 sthen Exp $
---- doc/example_silcd.conf.in.orig	Sun Nov  4 03:39:39 2007
-+++ doc/example_silcd.conf.in	Thu Mar  6 16:59:53 2008
+$OpenBSD: patch-doc_example_silcd_conf_in,v 1.8 2008/09/15 00:13:40 brad Exp $
+--- doc/example_silcd.conf.in.orig	Sat Sep 13 10:40:39 2008
++++ doc/example_silcd.conf.in	Sun Sep 14 19:07:16 2008
 @@ -22,7 +22,7 @@
  # Include global algorithms from the "silcalgs.conf" file.  This file defines
  # ciphers, hash functions, HMACs and PKCS algorithms that can be used.
@@ -10,7 +10,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.7 2008/03/22 23:06:50 sthen Exp $
  
  #
  # General configuration options
-@@ -186,14 +186,14 @@ ServerInfo {
+@@ -186,7 +186,7 @@ ServerInfo {
  	#
  	# Server name (FQDN)
  	#
@@ -19,15 +19,16 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.7 2008/03/22 23:06:50 sthen Exp $
  
  	#
  	# Primary listener.  Specify the IP address and the port to bind
- 	# the server.
+@@ -194,7 +194,7 @@ ServerInfo {
+ 	# if the server is behind NAT.
  	#
  	Primary {
 -		ip = "10.2.1.6";
 +		ip = "127.0.0.1";
+ 		# public_ip = "11.1.1.1";
  		port = 706;
  	};
- 
-@@ -213,37 +213,37 @@ ServerInfo {
+@@ -215,37 +215,37 @@ ServerInfo {
  	#
  	# Geographic location
  	#
@@ -73,7 +74,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.7 2008/03/22 23:06:50 sthen Exp $
  
  	#
  	# Pid file
-@@ -456,10 +456,10 @@ Client {
+@@ -458,10 +458,10 @@ Client {
  # required.
  #
  Admin {
@@ -88,7 +89,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.7 2008/03/22 23:06:50 sthen Exp $
  	# PublicKey = "/path/to/the/public.pub";
  };
  
-@@ -482,13 +482,13 @@ Admin {
+@@ -484,13 +484,13 @@ Admin {
  # to true.  For normal connections set it false.  If it is set to true then
  # your server will be backup router.
  #
@@ -109,7 +110,7 @@ $OpenBSD: patch-doc_example_silcd_conf_in,v 1.7 2008/03/22 23:06:50 sthen Exp $
  
  #
  # Configured router connections
-@@ -518,17 +518,17 @@ ServerConnection {
+@@ -520,17 +520,17 @@ ServerConnection {
  # backup router is in our cell then set the "BackupLocal" option to true.
  # If the backup router is in other cell then set it to false.
  #