diff --git a/net/irc/Makefile b/net/irc/Makefile
index bd55389e9a0..3b03db03586 100644
--- a/net/irc/Makefile
+++ b/net/irc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2001/04/10 16:18:02 bmc Exp $
+# $OpenBSD: Makefile,v 1.19 2001/04/20 07:31:35 bmc Exp $
 # $FreeBSD: Makefile,v 1.19 1998/12/09 20:15:29 billf Exp $
 
 COMMENT=	"internet relay chat (irc) server"
@@ -22,7 +22,13 @@ SYSCONFDIR=	/etc/ircd
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--logdir="/var/log/ircd" \
 		--localstatedir="/var/run" \
-		--enable-ip6
+
+FLAVORS=	ipv6
+FLAVOR?=	
+
+.if ${FLAVOR:L:Mipv6}
+CONFIGURE_ARGS+=	--enable-ip6
+.endif
 
 # syslog facility to use for logging
 SYSLOG_FACILITY=	LOG_LOCAL5
@@ -38,9 +44,8 @@ post-patch:
 
 do-install:	
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ircd
-	${INSTALL_PROGRAM} ${WRKSRC}/support/ircd ${PREFIX}/libexec/ircd
 	cd ${WRKBUILD}; ${INSTALL_PROGRAM} \
-		iauth chkconf ircdwatch ircd-mkpasswd \
+		iauth chkconf ircdwatch ircd-mkpasswd ircd \
 			${PREFIX}/sbin
 	cd ${WRKSRC}/doc; ${INSTALL_MAN} ircd.8 iauth.8 \
 		${PREFIX}/man/man8
diff --git a/net/irc/patches/patch-configure b/net/irc/patches/patch-configure
index 874cf388a3a..0aa7928bc3d 100644
--- a/net/irc/patches/patch-configure
+++ b/net/irc/patches/patch-configure
@@ -1,6 +1,6 @@
---- support/configure.orig	Thu Jan 11 13:26:00 2001
-+++ support/configure	Thu Jan 11 13:26:19 2001
-@@ -246,7 +246,7 @@
+--- support/configure.orig	Tue Jun  6 18:35:29 2000
++++ support/configure	Fri Apr 20 02:51:20 2001
+@@ -246,7 +246,7 @@ EOF
    -logdir | --logdir | --logdi | --logd)
      ac_prev=logdir ;;
    -logdir=* | --logdir=* | --logdi=* | --logd=*)
diff --git a/net/irc/patches/patch-ircd_s_user_c b/net/irc/patches/patch-ircd_s_user_c
index c74488fead4..202cabd104f 100644
--- a/net/irc/patches/patch-ircd_s_user_c
+++ b/net/irc/patches/patch-ircd_s_user_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-ircd_s_user_c,v 1.1 2001/04/10 16:18:03 bmc Exp $
---- ircd/s_user.c.orig	Fri Feb  9 09:05:55 2001
-+++ ircd/s_user.c	Fri Feb  9 09:05:59 2001
+$OpenBSD: patch-ircd_s_user_c,v 1.2 2001/04/20 07:31:36 bmc Exp $
+--- ircd/s_user.c.orig	Tue Jun  6 18:35:12 2000
++++ ircd/s_user.c	Fri Apr 20 02:52:27 2001
 @@ -2376,7 +2376,7 @@ char	*parv[];
  		       parv[0], sptr->user->username, sptr->user->host,
  		       sptr->auth, IsUnixSocket(sptr) ? sptr->sockhost :
@@ -10,7 +10,7 @@ $OpenBSD: patch-ircd_s_user_c,v 1.1 2001/04/10 16:18:03 bmc Exp $
  #else
                         inetntoa((char *)&sptr->ip));
  #endif
-@@ -2403,10 +2403,10 @@ char	*parv[];
+@@ -2403,7 +2403,7 @@ char	*parv[];
  			  parv[0], sptr->user->username, sptr->user->host,
  			  sptr->auth, IsUnixSocket(sptr) ? sptr->sockhost :
  #ifdef INET6
@@ -18,8 +18,4 @@ $OpenBSD: patch-ircd_s_user_c,v 1.1 2001/04/10 16:18:03 bmc Exp $
 +			  inet_ntop(AF_INET6, (char *)&sptr->ip, mydummy,
  				   MYDUMMY_SIZE));
  #else
--			  inetntoa((char *)&sptr->ip));
-+			  inet_ntoa((char *)&sptr->ip));
- #endif
- 		  (void)alarm(3);
- 		  (void)write(logfile, buf, strlen(buf));
+ 			  inetntoa((char *)&sptr->ip));
diff --git a/net/irc/pkg/PLIST b/net/irc/pkg/PLIST
index e8d99384a52..da3ae278646 100644
--- a/net/irc/pkg/PLIST
+++ b/net/irc/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.6 2001/01/28 00:47:21 brad Exp $
-libexec/ircd
+@comment $OpenBSD: PLIST,v 1.7 2001/04/20 07:31:36 bmc Exp $
 man/man5/iauth.conf.5
 man/man8/iauth.8
 man/man8/ircd.8
 sbin/chkconf
 sbin/iauth
+sbin/ircd
 sbin/ircd-mkpasswd
 sbin/ircdwatch
 share/examples/ircd/iauth.conf-sample