diff --git a/net/ngircd/Makefile b/net/ngircd/Makefile
index 75f3557cef7..4a840a4aa28 100644
--- a/net/ngircd/Makefile
+++ b/net/ngircd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2014/07/01 10:26:07 fgsch Exp $
+# $OpenBSD: Makefile,v 1.11 2014/12/03 10:32:18 jasper Exp $
 
 COMMENT =	lightweight irc server
 
-DISTNAME =	ngircd-21.1
+DISTNAME =	ngircd-22
 
 CATEGORIES =	net
 
diff --git a/net/ngircd/distinfo b/net/ngircd/distinfo
index aeac073d731..223a996595b 100644
--- a/net/ngircd/distinfo
+++ b/net/ngircd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ngircd-21.1.tar.gz) = lgg659vF34Uu/JBP/0gAlZ8QNVTeLG0JbeqlQIE19Z4=
-SIZE (ngircd-21.1.tar.gz) = 503084
+SHA256 (ngircd-22.tar.gz) = oI4Y3lK88J01znWoAiBOzwAPMmY8HFetkw680Tm/TMg=
+SIZE (ngircd-22.tar.gz) = 505806
diff --git a/net/ngircd/patches/patch-doc_sample-ngircd_conf_tmpl b/net/ngircd/patches/patch-doc_sample-ngircd_conf_tmpl
index 18f5a2ff0dd..ae4fc379eea 100644
--- a/net/ngircd/patches/patch-doc_sample-ngircd_conf_tmpl
+++ b/net/ngircd/patches/patch-doc_sample-ngircd_conf_tmpl
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.3 2013/11/03 23:29:28 fgsch Exp $
---- doc/sample-ngircd.conf.tmpl.orig	Wed Sep 18 22:12:44 2013
-+++ doc/sample-ngircd.conf.tmpl	Wed Oct 30 22:36:03 2013
-@@ -71,14 +71,14 @@
+$OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.4 2014/12/03 10:32:18 jasper Exp $
+--- doc/sample-ngircd.conf.tmpl.orig	Mon Jul 14 13:26:07 2014
++++ doc/sample-ngircd.conf.tmpl	Tue Dec  2 20:05:31 2014
+@@ -77,14 +77,14 @@
  	# Group ID under which the ngIRCd should run; you can use the name
  	# of the group or the numerical ID. ATTENTION: For this to work the
  	# server must have been started with root privileges!
@@ -18,7 +18,7 @@ $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.3 2013/11/03 23:29:28 fgsch Exp
  
  [Limits]
  	# Define some limits and timeouts for this ngIRCd instance. Default
-@@ -143,7 +143,7 @@
+@@ -149,7 +149,7 @@
  	# binary. By default ngIRCd won't use the chroot() feature.
  	# ATTENTION: For this to work the server must have been started
  	# with root privileges!
@@ -27,7 +27,7 @@ $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.3 2013/11/03 23:29:28 fgsch Exp
  
  	# Set this hostname for every client instead of the real one.
  	# Use %x to add the hashed value of the original hostname.
-@@ -246,7 +246,7 @@
+@@ -252,7 +252,7 @@
  	# So don't forget to remove the ";" above if this is the case ...
  
  	# SSL Server Key Certificate
@@ -36,7 +36,7 @@ $OpenBSD: patch-doc_sample-ngircd_conf_tmpl,v 1.3 2013/11/03 23:29:28 fgsch Exp
  
  	# Select cipher suites allowed for SSL/TLS connections. This defaults
  	# to HIGH:!aNULL:@STRENGTH (OpenSSL) or SECURE128 (GnuTLS).
-@@ -258,10 +258,10 @@
+@@ -264,10 +264,10 @@
  	;CipherList = SECURE128
  
  	# Diffie-Hellman parameters
diff --git a/net/ngircd/patches/patch-src_ngircd_conf_c b/net/ngircd/patches/patch-src_ngircd_conf_c
index db27be209ed..5718c44a1e8 100644
--- a/net/ngircd/patches/patch-src_ngircd_conf_c
+++ b/net/ngircd/patches/patch-src_ngircd_conf_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_ngircd_conf_c,v 1.4 2014/07/01 10:26:07 fgsch Exp $
---- src/ngircd/conf.c.orig	Sun Mar 23 13:07:42 2014
-+++ src/ngircd/conf.c	Wed Mar 26 09:18:26 2014
-@@ -759,7 +759,7 @@ Set_Defaults(bool InitServers)
+$OpenBSD: patch-src_ngircd_conf_c,v 1.5 2014/12/03 10:32:18 jasper Exp $
+--- src/ngircd/conf.c.orig	Fri Aug  1 23:40:50 2014
++++ src/ngircd/conf.c	Tue Dec  2 20:05:31 2014
+@@ -755,7 +755,7 @@ Set_Defaults(bool InitServers)
  	strlcat(Conf_HelpFile, HELP_FILE, sizeof(Conf_HelpFile));
  	strcpy(Conf_ServerPwd, "");
  	strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile));
diff --git a/net/ngircd/patches/patch-src_ngircd_ngircd_c b/net/ngircd/patches/patch-src_ngircd_ngircd_c
index fee43ea10bc..0cd5b56ec8a 100644
--- a/net/ngircd/patches/patch-src_ngircd_ngircd_c
+++ b/net/ngircd/patches/patch-src_ngircd_ngircd_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_ngircd_ngircd_c,v 1.3 2013/11/03 23:29:28 fgsch Exp $
---- src/ngircd/ngircd.c.orig	Wed Oct 16 19:59:20 2013
-+++ src/ngircd/ngircd.c	Wed Oct 30 22:14:16 2013
-@@ -572,7 +572,7 @@ Setup_FDStreams(int fd)
+$OpenBSD: patch-src_ngircd_ngircd_c,v 1.4 2014/12/03 10:32:18 jasper Exp $
+--- src/ngircd/ngircd.c.orig	Mon Jul 14 13:26:07 2014
++++ src/ngircd/ngircd.c	Tue Dec  2 20:05:31 2014
+@@ -563,7 +563,7 @@ Setup_FDStreams(int fd)
  #if !defined(SINGLE_USER_OS)
  
  /**
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.3 2013/11/03 23:29:28 fgsch Exp $
   *
   * @param uid	User ID
   * @param gid	Group ID
-@@ -596,7 +596,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
+@@ -587,7 +587,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
  	}
  #endif
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.3 2013/11/03 23:29:28 fgsch Exp $
  	if (!pwd)
  		return false;
  
-@@ -712,11 +712,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+@@ -703,11 +703,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
  	if (Conf_UID == 0) {
  		pwd = getpwuid(0);
  		Log(LOG_INFO,