diff --git a/net/ircd-hybrid/Makefile b/net/ircd-hybrid/Makefile
index c1c6c300211..b419083e308 100644
--- a/net/ircd-hybrid/Makefile
+++ b/net/ircd-hybrid/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+# $OpenBSD: Makefile,v 1.2 2009/02/04 10:24:07 ajacoutot Exp $
 
 COMMENT =	Internet Relay Chat server
 
 DISTNAME =	ircd-hybrid-7.2.3
+PKGNAME =	${DISTNAME}p0
 CATEGORIES =	net
 
 HOMEPAGE =	http://ircd-hybrid.com/
diff --git a/net/ircd-hybrid/patches/patch-configure b/net/ircd-hybrid/patches/patch-configure
index 355c4d6cd36..274f309aab4 100644
--- a/net/ircd-hybrid/patches/patch-configure
+++ b/net/ircd-hybrid/patches/patch-configure
@@ -1,6 +1,6 @@
-$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
+$OpenBSD: patch-configure,v 1.2 2009/02/04 10:24:07 ajacoutot Exp $
+--- configure.orig	Wed Feb 28 05:17:54 2007
++++ configure	Wed Feb  4 10:08:07 2009
 @@ -720,9 +720,9 @@ x_libraries=NONE
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -14,3 +14,20 @@ $OpenBSD: patch-configure,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
  datarootdir='${prefix}/share'
  datadir='${datarootdir}'
  sysconfdir='${prefix}/etc'
+@@ -2872,14 +2872,14 @@ echo $ECHO_N "checking if $CC is Apple GCC... $ECHO_C"
+ 	{ echo "$as_me:$LINENO: result: $AppleGCC" >&5
+ echo "${ECHO_T}$AppleGCC" >&6; }
+ 
+-	IRC_CFLAGS="$IRC_CFLAGS -Wall -O2"
++	IRC_CFLAGS="$IRC_CFLAGS -Wall"
+ fi
+ 
+ if test "$ac_cv_prog_cc_g" = yes; then
+ 		if test "$Tru" = yes; then
+ 		IRC_CFLAGS="$IRC_CFLAGS -g3"
+ 	else
+-		IRC_CFLAGS="$IRC_CFLAGS -g"
++		IRC_CFLAGS="$IRC_CFLAGS"
+ 	fi
+ fi
+ 
diff --git a/net/ircd-hybrid/pkg/MESSAGE b/net/ircd-hybrid/pkg/MESSAGE
index e85220137da..b4e13ee01e2 100644
--- a/net/ircd-hybrid/pkg/MESSAGE
+++ b/net/ircd-hybrid/pkg/MESSAGE
@@ -3,5 +3,5 @@ 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
+    sudo -u _ircd-hybrid ${TRUEPREFIX}/bin/ircd >/dev/null
 fi
diff --git a/net/ircd-hybrid/pkg/PLIST b/net/ircd-hybrid/pkg/PLIST
index 252eb815f5e..5c7012a0418 100644
--- a/net/ircd-hybrid/pkg/PLIST
+++ b/net/ircd-hybrid/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/28 23:35:07 bernd Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/02/04 10:24:07 ajacoutot Exp $
 @conflict bnc-*
 @conflict irc-*
 @newgroup _ircd-hybrid:616
@@ -14,14 +14,18 @@ lib/ircd-hybrid/modules/autoload/
 @man man/man8/ircd.8
 share/examples/ircd-hybrid/
 @sample ${SYSCONFDIR}/ircd-hybrid/
+@mode 640
+@owner _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
+@mode 644
 share/examples/ircd-hybrid/ircd.motd
 @sample ${SYSCONFDIR}/ircd-hybrid/ircd.motd
+@mode 640
 share/examples/ircd-hybrid/kline.conf
 @sample ${SYSCONFDIR}/ircd-hybrid/kline.conf
 share/examples/ircd-hybrid/nresv.conf
@@ -32,6 +36,8 @@ share/examples/ircd-hybrid/rxline.conf
 @sample ${SYSCONFDIR}/ircd-hybrid/rxline.conf
 share/examples/ircd-hybrid/xline.conf
 @sample ${SYSCONFDIR}/ircd-hybrid/xline.conf
+@mode
+@owner
 share/ircd-hybrid/
 share/ircd-hybrid/help/
 share/ircd-hybrid/help/opers/