diff --git a/net/ircd-hybrid/Makefile b/net/ircd-hybrid/Makefile
new file mode 100644
index 00000000000..c1c6c300211
--- /dev/null
+++ b/net/ircd-hybrid/Makefile
@@ -0,0 +1,35 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+
+COMMENT =	Internet Relay Chat server
+
+DISTNAME =	ircd-hybrid-7.2.3
+CATEGORIES =	net
+
+HOMEPAGE =	http://ircd-hybrid.com/
+
+# GPLv2
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
+EXTRACT_SUFX =		.tgz
+
+WANTLIB =		c crypto ssl z
+
+LIB_DEPENDS =		pcre::devel/pcre
+
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+MAKE_FLAGS =		AUTOMODULEDIR='$${prefix}/lib/ircd-hybrid/modules' \
+			moduledir='$${prefix}/lib/ircd-hybrid/modules'
+
+NO_REGRESS =		Yes
+
+pre-configure:
+	@${SUBST_CMD} ${WRKSRC}/etc/example.conf ${WRKSRC}/include/defaults.h
+
+.include <bsd.port.mk>
diff --git a/net/ircd-hybrid/distinfo b/net/ircd-hybrid/distinfo
new file mode 100644
index 00000000000..708e0345779
--- /dev/null
+++ b/net/ircd-hybrid/distinfo
@@ -0,0 +1,5 @@
+MD5 (ircd-hybrid-7.2.3.tgz) = aD/m4GY12HDPwhHzYHcvZw==
+RMD160 (ircd-hybrid-7.2.3.tgz) = WL7GXaJJJIC5pOhnd8bBmktWhAg=
+SHA1 (ircd-hybrid-7.2.3.tgz) = +KYeVQDSiktM3tXwlsNifC5fAaA=
+SHA256 (ircd-hybrid-7.2.3.tgz) = Z/BDRwq9bpIickT11k5T3qmHwBUdgyug0UKOvkHgSHA=
+SIZE (ircd-hybrid-7.2.3.tgz) = 1010625
diff --git a/net/ircd-hybrid/patches/patch-Makefile_in b/net/ircd-hybrid/patches/patch-Makefile_in
new file mode 100644
index 00000000000..4ee27266298
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-Makefile_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- Makefile.in.orig	Tue Jan 27 20:55:15 2009
++++ Makefile.in	Tue Jan 27 20:55:03 2009
+@@ -23,9 +23,9 @@ RM          = @RM@
+ 
+ # Default make flags - you may want to uncomment this on a multicpu machine
+ #MFLAGS   = -j 4
+-DEPEND_DIRS  = lib modules src servlink
++DEPEND_DIRS  = modules src servlink
+ BUILD_DIRS   = ${DEPEND_DIRS} tools
+-INSTALL_DIRS = ${BUILD_DIRS} etc doc help
++INSTALL_DIRS = ${BUILD_DIRS} etc doc help messages
+ CLEAN_DIRS   = ${BUILD_DIRS} contrib
+ # Anywhere that we can make install, we obviously can rm -f Makefile
+ DISTCLEAN_DIRS = ${INSTALL_DIRS} contrib messages
diff --git a/net/ircd-hybrid/patches/patch-configure b/net/ircd-hybrid/patches/patch-configure
new file mode 100644
index 00000000000..355c4d6cd36
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-configure
@@ -0,0 +1,16 @@
+$OpenBSD: patch-configure,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- configure.orig	Mon Apr 14 15:04:02 2008
++++ configure	Mon Apr 14 15:04:06 2008
+@@ -720,9 +720,9 @@ x_libraries=NONE
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
+ # (The list follows the same order as the GNU Coding Standards.)
+-bindir='${exec_prefix}/bin'
+-sbindir='${exec_prefix}/sbin'
+-libexecdir='${exec_prefix}/libexec'
++bindir='${prefix}/bin'
++sbindir='${prefix}/sbin'
++libexecdir='${prefix}/libexec'
+ datarootdir='${prefix}/share'
+ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
diff --git a/net/ircd-hybrid/patches/patch-etc_Makefile_in b/net/ircd-hybrid/patches/patch-etc_Makefile_in
new file mode 100644
index 00000000000..2890cb3a03b
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-etc_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-etc_Makefile_in,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- etc/Makefile.in.orig	Wed Feb 28 05:17:53 2007
++++ etc/Makefile.in	Mon Apr 14 15:23:40 2008
+@@ -10,7 +10,7 @@ TEST		= @TEST@
+ CLOBBER=@CLOBBER@
+ 
+ prefix		= $(DESTDIR)@prefix@
+-sysconfdir	= $(DESTDIR)@sysconfdir@
++sysconfdir	= $(DESTDIR)@prefix@/share/examples/ircd-hybrid
+ exec_prefix	= $(DESTDIR)@exec_prefix@
+ datarootdir	= $(DESTDIR)@datarootdir@
+ 
diff --git a/net/ircd-hybrid/patches/patch-etc_example_conf b/net/ircd-hybrid/patches/patch-etc_example_conf
new file mode 100644
index 00000000000..6144d449f8e
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-etc_example_conf
@@ -0,0 +1,50 @@
+$OpenBSD: patch-etc_example_conf,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- etc/example.conf.orig	Wed Feb 28 04:17:53 2007
++++ etc/example.conf	Tue Jan 27 09:45:27 2009
+@@ -102,7 +102,7 @@ serverinfo {
+ 	 *	chmod 0600 rsa.key
+ 	 *	chmod 0644 rsa.pub
+ 	 */
+-	#rsa_private_key_file = "/usr/local/ircd/etc/rsa.key";
++	#rsa_private_key_file = "${SYSCONFDIR}/ircd-hybrid/rsa.key";
+ 
+ 	/*
+ 	 * ssl certificate: the path to the file containing our ssl certificate
+@@ -122,7 +122,7 @@ serverinfo {
+ 	 *	Common Name: irc.someirc.net
+ 	 *	E-mail: you@domain.com
+ 	 */
+-	#ssl_certificate_file = "/usr/local/ircd/etc/cert.pem";
++	#ssl_certificate_file = "${SYSCONFDIR}/ircd-hybrid/cert.pem";
+ };
+ 
+ /*
+@@ -379,7 +379,7 @@ operator {
+ 	 * A password should not be defined when this is used, see 
+ 	 * doc/challenge.txt for more information.
+ 	 */
+-#	rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
++#	rsa_public_key_file = "${SYSCONFDIR}/ircd-hybrid/oper.pub";
+ 
+ 	/* class: the class the oper joins when they successfully /oper */
+ 	class = "opers";
+@@ -1190,7 +1190,7 @@ general {
+ 	 *
+ 	 * only define if servlink is not in same directory as ircd itself.
+ 	 */
+-	#servlink_path = "/usr/local/ircd/bin/servlink";
++	#servlink_path = "${TRUEPREFIX}/bin/servlink";
+ 
+ 	/*
+ 	 * default_cipher_preference: default cipher to use for cryptlink when none is
+@@ -1276,8 +1276,8 @@ modules {
+ 	 * module path: other paths to search for modules specified below
+ 	 * and in /modload.
+ 	 */
+-	path = "/usr/local/ircd/modules";
+-	path = "/usr/local/ircd/modules/autoload";
++	path = "${TRUEPREFIX}/lib/ircd-hybrid/modules";
++	path = "${TRUEPREFIX}/lib/ircd-hybrid/modules/autoload";
+ 
+ 	/* module: the name of a module to load on startup/rehash */
+ 	#module = "some_module.so";
diff --git a/net/ircd-hybrid/patches/patch-help_Makefile_in b/net/ircd-hybrid/patches/patch-help_Makefile_in
new file mode 100644
index 00000000000..65c4db96532
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-help_Makefile_in
@@ -0,0 +1,31 @@
+$OpenBSD: patch-help_Makefile_in,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- help/Makefile.in.orig	Wed Feb 28 05:17:47 2007
++++ help/Makefile.in	Tue Jan 27 20:47:38 2009
+@@ -8,8 +8,8 @@ RM		= @RM@
+ prefix		= @prefix@
+ exec_prefix	= @execprefix@
+ datarootdir	= $(DESTDIR)@datarootdir@
+-uhelpdir	= ${prefix}/help/users
+-ohelpdir	= ${prefix}/help/opers
++uhelpdir	= ${datarootdir}/ircd-hybrid/help/users
++ohelpdir	= ${datarootdir}/ircd-hybrid/help/opers
+ 
+ SYMLINKS	= topic accept cmode admin names links away whowas \
+ 		version kick who invite quit join list nick oper part \
+@@ -22,14 +22,8 @@ depend:
+ 
+ install: 
+ 	@echo installing help files...
+-	-@if test ! -d $(prefix)/help; then \
+-		echo "mkdir $(prefix)/help"; \
+-		mkdir $(prefix)/help; \
+-		echo "mkdir $(prefix)/help/users"; \
+-		mkdir $(prefix)/help/users; \
+-		echo "mkdir $(prefix)/help/opers"; \
+-		mkdir $(prefix)/help/opers; \
+-	fi
++	$(BSD_INSTALL_DATA_DIR) $(uhelpdir)
++	$(BSD_INSTALL_DATA_DIR) $(ohelpdir)
+ 	@for help in opers/*; do \
+ 	if [ -f $$help ]; then \
+ 		${INSTALL_DATA} $$help $(ohelpdir); \
diff --git a/net/ircd-hybrid/patches/patch-include_defaults_h b/net/ircd-hybrid/patches/patch-include_defaults_h
new file mode 100644
index 00000000000..1e256501d3f
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-include_defaults_h
@@ -0,0 +1,29 @@
+$OpenBSD: patch-include_defaults_h,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- include/defaults.h.orig	Wed Feb 28 05:17:43 2007
++++ include/defaults.h	Tue Jan 27 21:23:01 2009
+@@ -50,11 +50,11 @@
+ /* dirs */
+ #define DPATH       IRCD_PREFIX                                                     
+ #define BINPATH     IRCD_PREFIX "/bin/"
+-#define MSGPATH     IRCD_PREFIX "/messages/"
+-#define ETCPATH     IRCD_PREFIX "/etc"
+-#define LOGPATH     IRCD_PREFIX "/logs"
+-#define MODPATH     IRCD_PREFIX "/modules/"
+-#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
++#define MSGPATH     IRCD_PREFIX "/share/ircd-hybrid/messages/"
++#define ETCPATH     "${SYSCONFDIR}/ircd-hybrid"
++#define LOGPATH     "/var/log/ircd-hybrid"
++#define MODPATH     IRCD_PREFIX "/lib/ircd-hybrid/modules/"
++#define AUTOMODPATH IRCD_PREFIX "/lib/ircd-hybrid/modules/autoload/"
+ 
+ /* files */
+ #define SPATH   BINPATH "/ircd"                 /* ircd executable */
+@@ -70,7 +70,7 @@
+ #define RKPATH  ETCPATH "/rkline.conf"
+ #define MPATH   ETCPATH "/ircd.motd"            /* MOTD file */
+ #define LPATH   LOGPATH "/ircd.log"             /* ircd logfile */
+-#define PPATH   ETCPATH "/ircd.pid"             /* pid file */
++#define PPATH   "/var/run/ircd/ircd.pid"        /* pid file */
+ #define OPATH   ETCPATH "/opers.motd"           /* oper MOTD file */
+ #define LIPATH  ETCPATH "/links.txt"            /* cached links file */
+ 
diff --git a/net/ircd-hybrid/patches/patch-messages_Makefile_in b/net/ircd-hybrid/patches/patch-messages_Makefile_in
new file mode 100644
index 00000000000..69e73dc6f63
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-messages_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-messages_Makefile_in,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- messages/Makefile.in.orig	Tue Jan 27 21:15:57 2009
++++ messages/Makefile.in	Tue Jan 27 21:16:17 2009
+@@ -5,7 +5,7 @@ MV		= @MV@
+ INSTALL		= @INSTALL@
+ INSTALL_DATA	= @INSTALL_DATA@
+ prefix		= $(DESTDIR)@prefix@
+-messagedir	= $(prefix)/messages
++messagedir	= $(prefix)/share/ircd-hybrid/messages
+ datarootdir	= $(DESTDIR)@datarootdir@
+ 
+ CLOBBER		= @CLOBBER@
diff --git a/net/ircd-hybrid/patches/patch-modules_Makefile_in b/net/ircd-hybrid/patches/patch-modules_Makefile_in
new file mode 100644
index 00000000000..08cf5ab9c3b
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-modules_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-modules_Makefile_in,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- modules/Makefile.in.orig	Tue Jan 27 21:13:38 2009
++++ modules/Makefile.in	Tue Jan 27 21:13:46 2009
+@@ -27,7 +27,7 @@ datarootdir	= $(DESTDIR)@datarootdir@
+ moduledir       = ${prefix}/modules
+ automoduledir   = ${moduledir}/autoload
+ 
+-INCLUDES	= -I../include -I../lib/pcre $(SSL_INCLUDES)
++INCLUDES	= -I../include $(SSL_INCLUDES)
+ CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
+ 
+ CORE_SRCS = \
diff --git a/net/ircd-hybrid/patches/patch-modules_m_help_c b/net/ircd-hybrid/patches/patch-modules_m_help_c
new file mode 100644
index 00000000000..f1c6de0e6ef
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-modules_m_help_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-modules_m_help_c,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- modules/m_help.c.orig	Mon Apr 14 10:58:13 2008
++++ modules/m_help.c	Mon Apr 14 10:58:49 2008
+@@ -36,8 +36,8 @@
+ #include "modules.h"
+ #include "irc_string.h"
+ 
+-#define HPATH  IRCD_PREFIX "/help/opers"
+-#define UHPATH IRCD_PREFIX "/help/users"
++#define HPATH  IRCD_PREFIX "/share/ircd-hybrid/help/opers"
++#define UHPATH IRCD_PREFIX "/share/ircd-hybrid/help/users"
+ #define HELPLEN 400
+ 
+ static void m_help(struct Client *, struct Client *, int, char *[]);
diff --git a/net/ircd-hybrid/patches/patch-src_Makefile_in b/net/ircd-hybrid/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..686ee38a592
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-src_Makefile_in
@@ -0,0 +1,34 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- src/Makefile.in.orig	Wed Feb 28 05:17:46 2007
++++ src/Makefile.in	Tue Jan 27 21:09:42 2009
+@@ -35,8 +35,8 @@ PROGS		= ircd
+ 
+ SSL_LIBS	= @SSL_LIBS@
+ SSL_INCLUDES	= @SSL_INCLUDES@
+-IRCDLIBS	= @MODULES_LIBS@ @LIBS@ ../lib/pcre/libpcre.a $(SSL_LIBS)
+-INCLUDES	= -I../include -I../lib/pcre $(SSL_INCLUDES)
++IRCDLIBS	= @MODULES_LIBS@ @LIBS@ $(SSL_LIBS) -lpcre
++INCLUDES	= -I../include $(SSL_INCLUDES)
+ CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
+  
+ default:	all
+@@ -111,17 +111,14 @@ all: .depend ircd
+ 
+ build: all
+ 
+-ircd: @MODULES_LIBS@ ../lib/libpcre.a $(OBJS)
++ircd: @MODULES_LIBS@ $(OBJS)
+ 	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${IRCDLIBS}
+ 
+ ../modules/libmodules.a:
+ 	cd ../modules && ${MAKE} ${MFLAGS}
+-../lib/libpcre.a:
+-	cd ../lib/pcre && ${MAKE} ${MFLAGS}
+ 
+ install-mkdirs:
+-	mkdir -p $(DESTDIR)$(prefix) $(exec_prefix) $(bindir) $(sysconfdir) \
+-		$(localstatedir)/logs
++	mkdir -p $(DESTDIR)$(prefix) $(exec_prefix) $(bindir) $(sysconfdir)
+ 
+ install: install-mkdirs build
+ 	@for i in $(PROGS); do \
diff --git a/net/ircd-hybrid/patches/patch-src_s_serv_c b/net/ircd-hybrid/patches/patch-src_s_serv_c
new file mode 100644
index 00000000000..719694cdf78
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-src_s_serv_c
@@ -0,0 +1,17 @@
+$OpenBSD: patch-src_s_serv_c,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+
+Prevent warning on unsigned-char arches.
+
+"warning: comparison is always true due to limited range of data type"
+
+--- src/s_serv.c.orig	Tue Jan 27 09:26:50 2009
++++ src/s_serv.c	Tue Jan 27 09:27:17 2009
+@@ -2324,7 +2324,7 @@ cryptlink_error(struct Client *client_p, const char *t
+ static char base64_chars[] =
+         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+ 
+-static char base64_values[] =
++static signed char base64_values[] =
+ {
+ /* 00-15   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ /* 16-31   */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
diff --git a/net/ircd-hybrid/patches/patch-tools_Makefile_in b/net/ircd-hybrid/patches/patch-tools_Makefile_in
new file mode 100644
index 00000000000..6899488e316
--- /dev/null
+++ b/net/ircd-hybrid/patches/patch-tools_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-tools_Makefile_in,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+--- tools/Makefile.in.orig	Mon Apr 14 15:16:48 2008
++++ tools/Makefile.in	Mon Apr 14 15:16:57 2008
+@@ -18,7 +18,7 @@ CRYPT_LIB	= @CRYPT_LIB@
+ 
+ INCLUDES	= -I../include $(SSL_INCLUDES)
+ 
+-prefix		= $(DESTDIR)@prefix@
++prefix		= @prefix@
+ exec_prefix	= $(DESTDIR)@exec_prefix@
+ bindir		= $(DESTDIR)@bindir@
+ datarootdir	= $(DESTDIR)@datarootdir@
diff --git a/net/ircd-hybrid/pkg/DESCR b/net/ircd-hybrid/pkg/DESCR
new file mode 100644
index 00000000000..7b059fb5093
--- /dev/null
+++ b/net/ircd-hybrid/pkg/DESCR
@@ -0,0 +1,2 @@
+This is ircd-hybrid, the highly modified (and hopefully improved)
+variant of the original ircd program by Jarkko Oikarinen.
diff --git a/net/ircd-hybrid/pkg/MESSAGE b/net/ircd-hybrid/pkg/MESSAGE
new file mode 100644
index 00000000000..e85220137da
--- /dev/null
+++ b/net/ircd-hybrid/pkg/MESSAGE
@@ -0,0 +1,7 @@
+To start ircd-hybrid at boot time, edit ${SYSCONFDIR}/ircd-hybrid/ircd.conf
+as required and insert the following into /etc/rc.local.
+
+if [ -x ${TRUEPREFIX}/bin/ircd ]; then
+    install -d -o _ircd-hybrid /var/run/ircd
+    sudo -u _ircd-hybrid ${TRUEPREFIX}/bin/ircd
+fi
diff --git a/net/ircd-hybrid/pkg/PFRAG.shared b/net/ircd-hybrid/pkg/PFRAG.shared
new file mode 100644
index 00000000000..96f3b370696
--- /dev/null
+++ b/net/ircd-hybrid/pkg/PFRAG.shared
@@ -0,0 +1,75 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+lib/ircd-hybrid/modules/autoload/m_accept.so
+lib/ircd-hybrid/modules/autoload/m_admin.so
+lib/ircd-hybrid/modules/autoload/m_away.so
+lib/ircd-hybrid/modules/autoload/m_cap.so
+lib/ircd-hybrid/modules/autoload/m_capab.so
+lib/ircd-hybrid/modules/autoload/m_cburst.so
+lib/ircd-hybrid/modules/autoload/m_challenge.so
+lib/ircd-hybrid/modules/autoload/m_close.so
+lib/ircd-hybrid/modules/autoload/m_connect.so
+lib/ircd-hybrid/modules/autoload/m_cryptlink.so
+lib/ircd-hybrid/modules/autoload/m_drop.so
+lib/ircd-hybrid/modules/autoload/m_encap.so
+lib/ircd-hybrid/modules/autoload/m_eob.so
+lib/ircd-hybrid/modules/autoload/m_etrace.so
+lib/ircd-hybrid/modules/autoload/m_gline.so
+lib/ircd-hybrid/modules/autoload/m_hash.so
+lib/ircd-hybrid/modules/autoload/m_help.so
+lib/ircd-hybrid/modules/autoload/m_info.so
+lib/ircd-hybrid/modules/autoload/m_invite.so
+lib/ircd-hybrid/modules/autoload/m_ison.so
+lib/ircd-hybrid/modules/autoload/m_kline.so
+lib/ircd-hybrid/modules/autoload/m_knock.so
+lib/ircd-hybrid/modules/autoload/m_links.so
+lib/ircd-hybrid/modules/autoload/m_list.so
+lib/ircd-hybrid/modules/autoload/m_lljoin.so
+lib/ircd-hybrid/modules/autoload/m_llnick.so
+lib/ircd-hybrid/modules/autoload/m_locops.so
+lib/ircd-hybrid/modules/autoload/m_lusers.so
+lib/ircd-hybrid/modules/autoload/m_map.so
+lib/ircd-hybrid/modules/autoload/m_motd.so
+lib/ircd-hybrid/modules/autoload/m_names.so
+lib/ircd-hybrid/modules/autoload/m_nburst.so
+lib/ircd-hybrid/modules/autoload/m_omotd.so
+lib/ircd-hybrid/modules/autoload/m_oper.so
+lib/ircd-hybrid/modules/autoload/m_operwall.so
+lib/ircd-hybrid/modules/autoload/m_pass.so
+lib/ircd-hybrid/modules/autoload/m_ping.so
+lib/ircd-hybrid/modules/autoload/m_pong.so
+lib/ircd-hybrid/modules/autoload/m_post.so
+lib/ircd-hybrid/modules/autoload/m_rehash.so
+lib/ircd-hybrid/modules/autoload/m_restart.so
+lib/ircd-hybrid/modules/autoload/m_resv.so
+lib/ircd-hybrid/modules/autoload/m_rkline.so
+lib/ircd-hybrid/modules/autoload/m_rxline.so
+lib/ircd-hybrid/modules/autoload/m_set.so
+lib/ircd-hybrid/modules/autoload/m_stats.so
+lib/ircd-hybrid/modules/autoload/m_svinfo.so
+lib/ircd-hybrid/modules/autoload/m_tburst.so
+lib/ircd-hybrid/modules/autoload/m_testline.so
+lib/ircd-hybrid/modules/autoload/m_testmask.so
+lib/ircd-hybrid/modules/autoload/m_time.so
+lib/ircd-hybrid/modules/autoload/m_topic.so
+lib/ircd-hybrid/modules/autoload/m_trace.so
+lib/ircd-hybrid/modules/autoload/m_user.so
+lib/ircd-hybrid/modules/autoload/m_userhost.so
+lib/ircd-hybrid/modules/autoload/m_users.so
+lib/ircd-hybrid/modules/autoload/m_version.so
+lib/ircd-hybrid/modules/autoload/m_wallops.so
+lib/ircd-hybrid/modules/autoload/m_who.so
+lib/ircd-hybrid/modules/autoload/m_whois.so
+lib/ircd-hybrid/modules/autoload/m_whowas.so
+lib/ircd-hybrid/modules/autoload/m_xline.so
+lib/ircd-hybrid/modules/m_die.so
+lib/ircd-hybrid/modules/m_join.so
+lib/ircd-hybrid/modules/m_kick.so
+lib/ircd-hybrid/modules/m_kill.so
+lib/ircd-hybrid/modules/m_message.so
+lib/ircd-hybrid/modules/m_mode.so
+lib/ircd-hybrid/modules/m_nick.so
+lib/ircd-hybrid/modules/m_part.so
+lib/ircd-hybrid/modules/m_quit.so
+lib/ircd-hybrid/modules/m_server.so
+lib/ircd-hybrid/modules/m_sjoin.so
+lib/ircd-hybrid/modules/m_squit.so
diff --git a/net/ircd-hybrid/pkg/PLIST b/net/ircd-hybrid/pkg/PLIST
new file mode 100644
index 00000000000..252eb815f5e
--- /dev/null
+++ b/net/ircd-hybrid/pkg/PLIST
@@ -0,0 +1,184 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+@conflict bnc-*
+@conflict irc-*
+@newgroup _ircd-hybrid:616
+@newuser _ircd-hybrid:616:616:daemon:IRC Daemon:/var/empty:/sbin/nologin
+%%SHARED%%
+@bin bin/encspeed
+@bin bin/ircd
+@bin bin/mkpasswd
+@bin bin/servlink
+lib/ircd-hybrid/
+lib/ircd-hybrid/modules/
+lib/ircd-hybrid/modules/autoload/
+@man man/man8/ircd.8
+share/examples/ircd-hybrid/
+@sample ${SYSCONFDIR}/ircd-hybrid/
+share/examples/ircd-hybrid/cresv.conf
+@sample ${SYSCONFDIR}/ircd-hybrid/cresv.conf
+share/examples/ircd-hybrid/dline.conf
+@sample ${SYSCONFDIR}/ircd-hybrid/dline.conf
+share/examples/ircd-hybrid/example.conf
+@sample ${SYSCONFDIR}/ircd-hybrid/ircd.conf
+share/examples/ircd-hybrid/ircd.motd
+@sample ${SYSCONFDIR}/ircd-hybrid/ircd.motd
+share/examples/ircd-hybrid/kline.conf
+@sample ${SYSCONFDIR}/ircd-hybrid/kline.conf
+share/examples/ircd-hybrid/nresv.conf
+@sample ${SYSCONFDIR}/ircd-hybrid/nresv.conf
+share/examples/ircd-hybrid/rkline.conf
+@sample ${SYSCONFDIR}/ircd-hybrid/rkline.conf
+share/examples/ircd-hybrid/rxline.conf
+@sample ${SYSCONFDIR}/ircd-hybrid/rxline.conf
+share/examples/ircd-hybrid/xline.conf
+@sample ${SYSCONFDIR}/ircd-hybrid/xline.conf
+share/ircd-hybrid/
+share/ircd-hybrid/help/
+share/ircd-hybrid/help/opers/
+share/ircd-hybrid/help/opers/accept
+share/ircd-hybrid/help/opers/admin
+share/ircd-hybrid/help/opers/away
+share/ircd-hybrid/help/opers/capab
+share/ircd-hybrid/help/opers/cburst
+share/ircd-hybrid/help/opers/challenge
+share/ircd-hybrid/help/opers/client
+share/ircd-hybrid/help/opers/close
+share/ircd-hybrid/help/opers/cmode
+share/ircd-hybrid/help/opers/connect
+share/ircd-hybrid/help/opers/cryptlink
+share/ircd-hybrid/help/opers/die
+share/ircd-hybrid/help/opers/dline
+share/ircd-hybrid/help/opers/drop
+share/ircd-hybrid/help/opers/eob
+share/ircd-hybrid/help/opers/error
+share/ircd-hybrid/help/opers/etrace
+share/ircd-hybrid/help/opers/gline
+share/ircd-hybrid/help/opers/hash
+share/ircd-hybrid/help/opers/help
+share/ircd-hybrid/help/opers/index
+share/ircd-hybrid/help/opers/info
+share/ircd-hybrid/help/opers/invite
+share/ircd-hybrid/help/opers/ison
+share/ircd-hybrid/help/opers/join
+share/ircd-hybrid/help/opers/kick
+share/ircd-hybrid/help/opers/kill
+share/ircd-hybrid/help/opers/kline
+share/ircd-hybrid/help/opers/knock
+share/ircd-hybrid/help/opers/knockll
+share/ircd-hybrid/help/opers/links
+share/ircd-hybrid/help/opers/list
+share/ircd-hybrid/help/opers/lljoin
+share/ircd-hybrid/help/opers/llnick
+share/ircd-hybrid/help/opers/locops
+share/ircd-hybrid/help/opers/lusers
+share/ircd-hybrid/help/opers/map
+share/ircd-hybrid/help/opers/modlist
+share/ircd-hybrid/help/opers/modload
+share/ircd-hybrid/help/opers/modrestart
+share/ircd-hybrid/help/opers/modunload
+share/ircd-hybrid/help/opers/motd
+share/ircd-hybrid/help/opers/names
+share/ircd-hybrid/help/opers/nburst
+share/ircd-hybrid/help/opers/nick
+share/ircd-hybrid/help/opers/notice
+share/ircd-hybrid/help/opers/omotd
+share/ircd-hybrid/help/opers/oper
+share/ircd-hybrid/help/opers/operwall
+share/ircd-hybrid/help/opers/part
+share/ircd-hybrid/help/opers/pass
+share/ircd-hybrid/help/opers/ping
+share/ircd-hybrid/help/opers/pong
+share/ircd-hybrid/help/opers/post
+share/ircd-hybrid/help/opers/privmsg
+share/ircd-hybrid/help/opers/quit
+share/ircd-hybrid/help/opers/rehash
+share/ircd-hybrid/help/opers/restart
+share/ircd-hybrid/help/opers/resv
+share/ircd-hybrid/help/opers/rkline
+share/ircd-hybrid/help/opers/rxline
+share/ircd-hybrid/help/opers/server
+share/ircd-hybrid/help/opers/set
+share/ircd-hybrid/help/opers/sjoin
+share/ircd-hybrid/help/opers/squit
+share/ircd-hybrid/help/opers/stats
+share/ircd-hybrid/help/opers/svinfo
+share/ircd-hybrid/help/opers/testgecos
+share/ircd-hybrid/help/opers/testline
+share/ircd-hybrid/help/opers/testmask
+share/ircd-hybrid/help/opers/time
+share/ircd-hybrid/help/opers/topic
+share/ircd-hybrid/help/opers/trace
+share/ircd-hybrid/help/opers/uhelp
+share/ircd-hybrid/help/opers/umode
+share/ircd-hybrid/help/opers/undline
+share/ircd-hybrid/help/opers/ungline
+share/ircd-hybrid/help/opers/unkline
+share/ircd-hybrid/help/opers/unresv
+share/ircd-hybrid/help/opers/unxline
+share/ircd-hybrid/help/opers/user
+share/ircd-hybrid/help/opers/userhost
+share/ircd-hybrid/help/opers/users
+share/ircd-hybrid/help/opers/version
+share/ircd-hybrid/help/opers/wallops
+share/ircd-hybrid/help/opers/who
+share/ircd-hybrid/help/opers/whois
+share/ircd-hybrid/help/opers/whowas
+share/ircd-hybrid/help/opers/xline
+share/ircd-hybrid/help/users/
+share/ircd-hybrid/help/users/accept
+share/ircd-hybrid/help/users/admin
+share/ircd-hybrid/help/users/away
+share/ircd-hybrid/help/users/challenge
+share/ircd-hybrid/help/users/cmode
+share/ircd-hybrid/help/users/error
+share/ircd-hybrid/help/users/help
+share/ircd-hybrid/help/users/index
+share/ircd-hybrid/help/users/info
+share/ircd-hybrid/help/users/invite
+share/ircd-hybrid/help/users/ison
+share/ircd-hybrid/help/users/join
+share/ircd-hybrid/help/users/kick
+share/ircd-hybrid/help/users/knock
+share/ircd-hybrid/help/users/links
+share/ircd-hybrid/help/users/list
+share/ircd-hybrid/help/users/lusers
+share/ircd-hybrid/help/users/map
+share/ircd-hybrid/help/users/motd
+share/ircd-hybrid/help/users/names
+share/ircd-hybrid/help/users/nick
+share/ircd-hybrid/help/users/notice
+share/ircd-hybrid/help/users/oper
+share/ircd-hybrid/help/users/part
+share/ircd-hybrid/help/users/pass
+share/ircd-hybrid/help/users/ping
+share/ircd-hybrid/help/users/pong
+share/ircd-hybrid/help/users/privmsg
+share/ircd-hybrid/help/users/quit
+share/ircd-hybrid/help/users/stats
+share/ircd-hybrid/help/users/time
+share/ircd-hybrid/help/users/topic
+share/ircd-hybrid/help/users/umode
+share/ircd-hybrid/help/users/user
+share/ircd-hybrid/help/users/userhost
+share/ircd-hybrid/help/users/users
+share/ircd-hybrid/help/users/version
+share/ircd-hybrid/help/users/who
+share/ircd-hybrid/help/users/whois
+share/ircd-hybrid/help/users/whowas
+share/ircd-hybrid/messages/
+share/ircd-hybrid/messages/ayb.lang
+share/ircd-hybrid/messages/custom.lang
+share/ircd-hybrid/messages/ircd-brazilian_pt.lang
+share/ircd-hybrid/messages/ircd-croatian.lang
+share/ircd-hybrid/messages/ircd-danish.lang
+share/ircd-hybrid/messages/ircd-dutch.lang
+share/ircd-hybrid/messages/ircd-french.lang
+share/ircd-hybrid/messages/ircd-german.lang
+share/ircd-hybrid/messages/ircd-italian.lang
+share/ircd-hybrid/messages/ircd-norwegian.lang
+share/ircd-hybrid/messages/ircd-polish.lang
+share/ircd-hybrid/messages/ircd-russian.lang
+share/ircd-hybrid/messages/ircd-spanish.lang
+share/ircd-hybrid/messages/ircd-swedish.lang
+@owner _ircd-hybrid
+@sample /var/log/ircd-hybrid/