diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index 84b8335b8f2..46070216b2f 100644
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2006/12/16 12:22:34 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2007/05/16 19:29:11 martynas Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"modular IRC client with many features (ipv6,socks,proxy)"
 
-DISTNAME=	irssi-0.8.10
-DISTFILES=	irssi-0.8.10a.tar.gz
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	irssi-0.8.11
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.irssi.org/
@@ -47,12 +45,18 @@ CONFIGURE_ARGS+=	--with-socks
 BUILD_DEPENDS+=		::security/dante
 .endif
 
+MAKE_FLAGS=	scriptdir="${SYSCONFDIR}/irssi/scripts" \
+		themedir="${SYSCONFDIR}/irssi/themes"
+FAKE_FLAGS=	DESTDIR=${WRKINST} \
+		confdir="${PREFIX}/share/examples/irssi" \
+		scriptdir="${PREFIX}/share/examples/irssi/scripts" \
+		themedir="${PREFIX}/share/examples/irssi/themes"
+
 pre-configure:
 	@perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" \
 		-e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g" ${WRKSRC}/docs/irssi.1
 
 post-install:
-	${INSTALL_DATA} ${WRKDIST}/irssi.conf ${PREFIX}/share/examples/irssi
 	@rm -rf ${PREFIX}/include
 
 .include <bsd.port.mk>
diff --git a/net/irssi/distinfo b/net/irssi/distinfo
index 20c45b6be89..f2f797b2e98 100644
--- a/net/irssi/distinfo
+++ b/net/irssi/distinfo
@@ -1,5 +1,5 @@
-MD5 (irssi-0.8.10a.tar.gz) = eBQHliBcb6HEPkbS555gqg==
-RMD160 (irssi-0.8.10a.tar.gz) = iAUI4YpNiWpcMdwgtnpu+Gyca5Q=
-SHA1 (irssi-0.8.10a.tar.gz) = qi0vFwG7Sa/F6gkQLWOW9OATod0=
-SHA256 (irssi-0.8.10a.tar.gz) = Q/7SccKA1hzOPe6Vsu+WAyak99clvRxinUjWsuipZGM=
-SIZE (irssi-0.8.10a.tar.gz) = 1056233
+MD5 (irssi-0.8.11.tar.gz) = 7iOqDwROksCZxqyxFpMOAw==
+RMD160 (irssi-0.8.11.tar.gz) = DLJ7iq60Ddtn8wszy2nzjPmJBMk=
+SHA1 (irssi-0.8.11.tar.gz) = rIX9+J5Oqqi2oMijtHxH80+BFlo=
+SHA256 (irssi-0.8.11.tar.gz) = zcmaOYlU4+TW5e+qE9Toy0X0nAa6CwjQ0FWqEP5blN8=
+SIZE (irssi-0.8.11.tar.gz) = 1332242
diff --git a/net/irssi/patches/patch-Makefile_in b/net/irssi/patches/patch-Makefile_in
deleted file mode 100644
index c7928124f1a..00000000000
--- a/net/irssi/patches/patch-Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
---- Makefile.in.orig	Mon Apr 17 14:39:54 2006
-+++ Makefile.in	Mon Apr 17 14:40:27 2006
-@@ -132,7 +132,7 @@ SUBDIRS = src docs scripts
- confdir = $(sysconfdir)
- conf_DATA = irssi.conf
- 
--themedir = $(datadir)/irssi/themes
-+themedir = $(datadir)/examples/irssi/themes
- theme_DATA = default.theme colorless.theme
- 
- pkginclude_HEADERS = config.h irssi-version.h
diff --git a/net/irssi/patches/patch-docs_irssi_1 b/net/irssi/patches/patch-docs_irssi_1
index 80031ab9366..c86da1b5046 100644
--- a/net/irssi/patches/patch-docs_irssi_1
+++ b/net/irssi/patches/patch-docs_irssi_1
@@ -1,6 +1,6 @@
-$OpenBSD: patch-docs_irssi_1,v 1.1 2006/04/18 20:30:03 steven Exp $
---- docs/irssi.1.orig	Wed Oct 19 04:13:33 2005
-+++ docs/irssi.1	Tue Apr 18 11:19:37 2006
+$OpenBSD: patch-docs_irssi_1,v 1.2 2007/05/16 19:29:11 martynas Exp $
+--- docs/irssi.1.orig	Wed Apr 25 21:13:56 2007
++++ docs/irssi.1	Sun May 13 15:52:54 2007
 @@ -69,10 +69,10 @@ display brief usage message.
  .SH SEE ALSO
  .B Irssi
@@ -14,7 +14,7 @@ $OpenBSD: patch-docs_irssi_1,v 1.1 2006/04/18 20:30:03 steven Exp $
  Global configuration file
  .TP
  .I ~/.irssi/config
-@@ -87,14 +87,29 @@ Default irssi theme
+@@ -87,13 +87,18 @@ Default irssi theme
  .I ~/.irssi/away.log
  Logged messages in away status
  .TP
@@ -29,24 +29,11 @@ $OpenBSD: patch-docs_irssi_1,v 1.1 2006/04/18 20:30:03 steven Exp $
 +.RE
  .TP
 -.I /usr/share/irssi/scripts/
--Global scripts directory
 +.I !!SYSCONFDIR!!/irssi/scripts/
-+.RS .3
-+.I !!LOCALBASE!!/share/examples/irssi/scripts/
-+.RE
-+.RS
-+Global scripts directories
-+.RE
+ Global scripts directory
  .TP
 -.I /usr/share/irssi/themes/
--Global themes directory
 +.I !!SYSCONFDIR!!/irssi/themes/
-+.RS .3
-+.I !!LOCALBASE!!/share/examples/irssi/themes/
-+.RE
-+.RS
-+Global themes directories
-+.RE
+ Global themes directory
  .TP
  .I ~/.irssi/scripts/
- Default scripts directory
diff --git a/net/irssi/patches/patch-scripts_Makefile_in b/net/irssi/patches/patch-scripts_Makefile_in
deleted file mode 100644
index 08a55a3daff..00000000000
--- a/net/irssi/patches/patch-scripts_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-scripts_Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
---- scripts/Makefile.in.orig	Mon Apr 17 17:08:15 2006
-+++ scripts/Makefile.in	Mon Apr 17 17:09:13 2006
-@@ -125,7 +125,7 @@ sedpath = @sedpath@
- 
- SUBDIRS = examples
- 
--scriptdir = $(datadir)/irssi/scripts
-+scriptdir = $(datadir)/examples/irssi/scripts
- 
- script_DATA =  	autoop.pl 	autorejoin.pl 	buf.pl 	dns.pl 	kills.pl 	mail.pl 	mlock.pl 	quitmsg.pl 	scriptassist.pl 	splitlong.pl 	usercount.pl
- 
diff --git a/net/irssi/patches/patch-scripts_examples_Makefile_in b/net/irssi/patches/patch-scripts_examples_Makefile_in
deleted file mode 100644
index 92fdb61328b..00000000000
--- a/net/irssi/patches/patch-scripts_examples_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-scripts_examples_Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
---- scripts/examples/Makefile.in.orig	Mon Apr 17 20:09:09 2006
-+++ scripts/examples/Makefile.in	Mon Apr 17 20:09:31 2006
-@@ -123,7 +123,7 @@ perl_static_lib = @perl_static_lib@
- perlpath = @perlpath@
- sedpath = @sedpath@
- 
--scriptdir = $(datadir)/irssi/scripts
-+scriptdir = $(datadir)/examples/irssi/scripts
- 
- script_DATA =  	command.pl 	msg-event.pl 	redirect.pl
- 
diff --git a/net/irssi/patches/patch-src_core_settings_c b/net/irssi/patches/patch-src_core_settings_c
index a29edd00e24..8693c856f4b 100644
--- a/net/irssi/patches/patch-src_core_settings_c
+++ b/net/irssi/patches/patch-src_core_settings_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_core_settings_c,v 1.1 2006/04/18 20:30:03 steven Exp $
---- src/core/settings.c.orig	Sun Mar 26 23:59:41 2006
-+++ src/core/settings.c	Mon Mar 27 00:13:38 2006
-@@ -674,7 +674,7 @@ static CONFIG_REC *parse_configfile(cons
+$OpenBSD: patch-src_core_settings_c,v 1.2 2007/05/16 19:29:11 martynas Exp $
+--- src/core/settings.c.orig	Wed Apr 25 21:13:56 2007
++++ src/core/settings.c	Sun May 13 15:38:40 2007
+@@ -674,7 +674,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
  	else {
  		/* user configuration file not found, use the default one
  		   from sysconfdir */
diff --git a/net/irssi/patches/patch-src_fe-common_core_Makefile_in b/net/irssi/patches/patch-src_fe-common_core_Makefile_in
index 997c1ee098d..da150f86e43 100644
--- a/net/irssi/patches/patch-src_fe-common_core_Makefile_in
+++ b/net/irssi/patches/patch-src_fe-common_core_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
---- src/fe-common/core/Makefile.in.orig	Mon Mar 27 04:17:59 2006
-+++ src/fe-common/core/Makefile.in	Mon Mar 27 04:18:52 2006
-@@ -125,7 +125,7 @@ sedpath = @sedpath@
+$OpenBSD: patch-src_fe-common_core_Makefile_in,v 1.2 2007/05/16 19:29:11 martynas Exp $
+--- src/fe-common/core/Makefile.in.orig	Wed Apr 25 21:14:34 2007
++++ src/fe-common/core/Makefile.in	Sun May 13 01:41:02 2007
+@@ -256,7 +256,7 @@ INCLUDES = \
+ 	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
+ 	$(GLIB_CFLAGS) \
+ 	-DHELPDIR=\""$(datadir)/irssi/help"\" \
+-	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
++	-DTHEMESDIR=\""$(sysconfdir)/irssi/themes"\"
  
- noinst_LIBRARIES = libfe_common_core.a
- 
--INCLUDES =  	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ 	$(GLIB_CFLAGS) 	-DHELPDIR=\""$(datadir)/irssi/help"\" 	-DTHEMESDIR=\""$(datadir)/irssi/themes"\"
-+INCLUDES =  	-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ 	$(GLIB_CFLAGS) 	-DHELPDIR=\""$(datadir)/irssi/help"\" 	-DTHEMESDIR=\""$(datadir)/examples/irssi/themes"\"	-DSYSCONFDIR=\""$(sysconfdir)"\"
- 
- 
- libfe_common_core_a_SOURCES =  	autorun.c 	chat-completion.c 	command-history.c 	completion.c 	fe-channels.c 	fe-common-core.c 	fe-core-commands.c 	fe-exec.c 	fe-expandos.c 	fe-help.c 	fe-ignore.c 	fe-ignore-messages.c 	fe-log.c 	fe-messages.c 	fe-modules.c 	fe-queries.c 	fe-server.c 	fe-settings.c 	utf8.c 	formats.c 	hilight-text.c 	keyboard.c 	module-formats.c 	printtext.c 	fe-recode.c 	themes.c 	translation.c 	window-activity.c 	window-commands.c 	window-items.c 	windows-layout.c 	fe-windows.c
+ libfe_common_core_a_SOURCES = \
+ 	autorun.c \
diff --git a/net/irssi/patches/patch-src_fe-common_core_fe-common-core_c b/net/irssi/patches/patch-src_fe-common_core_fe-common-core_c
index aa3662ea77e..c78a6077e6e 100644
--- a/net/irssi/patches/patch-src_fe-common_core_fe-common-core_c
+++ b/net/irssi/patches/patch-src_fe-common_core_fe-common-core_c
@@ -1,31 +1,13 @@
-$OpenBSD: patch-src_fe-common_core_fe-common-core_c,v 1.1 2006/04/18 20:30:03 steven Exp $
---- src/fe-common/core/fe-common-core.c.orig	Fri Feb  3 02:41:33 2006
-+++ src/fe-common/core/fe-common-core.c	Fri Feb  3 02:47:45 2006
-@@ -25,8 +25,8 @@
- #include "levels.h"
- #include "settings.h"
- #include "irssi-version.h"
--#ifdef HAVE_NL_LANGINFO
--#  include <langinfo.h>
-+#ifdef USE_LIBICONV
-+#include <localcharset.h>
- #endif
- 
- #include "servers.h"
-@@ -174,10 +174,12 @@ void fe_common_core_init(void)
- 
- 	settings_add_bool("lookandfeel", "use_status_window", TRUE);
+$OpenBSD: patch-src_fe-common_core_fe-common-core_c,v 1.2 2007/05/16 19:29:11 martynas Exp $
+--- src/fe-common/core/fe-common-core.c.orig	Wed Apr 25 21:13:56 2007
++++ src/fe-common/core/fe-common-core.c	Sun May  6 15:07:18 2007
+@@ -176,7 +176,8 @@ void fe_common_core_init(void)
  	settings_add_bool("lookandfeel", "use_msgs_window", FALSE);
--#if defined (HAVE_NL_LANGINFO) && defined(CODESET)
--	settings_add_str("lookandfeel", "term_charset", 
+ #if defined (HAVE_NL_LANGINFO) && defined(CODESET)
+ 	settings_add_str("lookandfeel", "term_charset", 
 -			 *nl_langinfo(CODESET) != '\0' ? 
--			 nl_langinfo(CODESET) : "ISO8859-1");
-+
-+#ifdef USE_LIBICONV
-+	settings_add_str("lookandfeel", "term_charset",
-+			 *locale_charset() != '\0' ?
-+			 locale_charset() : "ISO8859-1");
-+
++			 ((*nl_langinfo(CODESET) != '\0') &&
++			 (strcmp(nl_langinfo(CODESET), "646") != 0)) ? /* ASCII */
+ 			 nl_langinfo(CODESET) : "ISO8859-1");
  #else
  	settings_add_str("lookandfeel", "term_charset", "ISO8859-1");
- #endif
diff --git a/net/irssi/patches/patch-src_fe-common_core_fe-recode_c b/net/irssi/patches/patch-src_fe-common_core_fe-recode_c
new file mode 100644
index 00000000000..fa02a106237
--- /dev/null
+++ b/net/irssi/patches/patch-src_fe-common_core_fe-recode_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_fe-common_core_fe-recode_c,v 1.1 2007/05/16 19:29:11 martynas Exp $
+--- src/fe-common/core/fe-recode.c.orig	Wed Apr 25 21:13:56 2007
++++ src/fe-common/core/fe-recode.c	Wed May 16 16:20:20 2007
+@@ -182,8 +182,8 @@ static void read_settings(void)
+ 		g_free(term_charset);
+ #if defined (HAVE_NL_LANGINFO) && defined(CODESET)
+ 		term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : 
+-			       *nl_langinfo(CODESET) != '\0' ? g_strdup(nl_langinfo(CODESET)) : 
+-			       "ISO8859-1";
++			       ((*nl_langinfo(CODESET) != '\0') && (strcmp(nl_langinfo(CODESET), "646") != 0)) ?
++			       g_strdup(nl_langinfo(CODESET)) : "ISO8859-1";
+ #else
+ 		term_charset = is_valid_charset(old_term_charset) ? g_strdup(old_term_charset) : "ISO8859-1";
+ #endif		
diff --git a/net/irssi/patches/patch-src_fe-common_core_themes_c b/net/irssi/patches/patch-src_fe-common_core_themes_c
deleted file mode 100644
index 06f917d6a9f..00000000000
--- a/net/irssi/patches/patch-src_fe-common_core_themes_c
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_fe-common_core_themes_c,v 1.1 2006/04/18 20:30:03 steven Exp $
---- src/fe-common/core/themes.c.orig	Wed Oct 19 04:13:20 2005
-+++ src/fe-common/core/themes.c	Thu Apr  6 14:00:43 2006
-@@ -838,12 +838,15 @@ THEME_REC *theme_load(const char *setnam
- 	if (stat(fname, &statbuf) != 0) {
- 		/* check global config dir */
- 		g_free(fname);
--		fname = g_strdup_printf(THEMESDIR"/%s.theme", name);
-+		fname = g_strdup_printf(SYSCONFDIR"/irssi/themes/%s.theme", name);
- 		if (stat(fname, &statbuf) != 0) {
--			/* theme not found */
--			g_free(fname);
--			g_free(name);
--			return theme; /* use the one in memory if possible */
-+			fname = g_strdup_printf(THEMESDIR"/%s.theme", name);
-+			if (stat(fname, &statbuf) != 0) {
-+				/* theme not found */
-+				g_free(fname);
-+				g_free(name);
-+				return theme; /* use the one in memory if possible */
-+			}
- 		}
- 	}
- 
diff --git a/net/irssi/patches/patch-src_irc_dcc_dcc_c b/net/irssi/patches/patch-src_irc_dcc_dcc_c
deleted file mode 100644
index 5d1bd48114a..00000000000
--- a/net/irssi/patches/patch-src_irc_dcc_dcc_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_irc_dcc_dcc_c,v 1.1 2006/06/13 02:02:04 jolan Exp $
---- src/irc/dcc/dcc.c.orig	Tue Oct 18 21:13:31 2005
-+++ src/irc/dcc/dcc.c	Mon Jun 12 20:57:28 2006
-@@ -58,8 +58,8 @@ void dcc_unregister_type(const char *typ
- 
- 	pos = gslist_find_string(dcc_types, type);
- 	if (pos != NULL) {
--                dcc_types = g_slist_remove(dcc_types, pos->data);
- 		g_free(pos->data);
-+		dcc_types = g_slist_remove(dcc_types, pos->data);
- 	}
- }
- 
diff --git a/net/irssi/patches/patch-src_irc_proxy_Makefile_in b/net/irssi/patches/patch-src_irc_proxy_Makefile_in
index b5e2bf1facf..3e9f00e928b 100644
--- a/net/irssi/patches/patch-src_irc_proxy_Makefile_in
+++ b/net/irssi/patches/patch-src_irc_proxy_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_irc_proxy_Makefile_in,v 1.2 2006/04/18 20:30:03 steven Exp $
---- src/irc/proxy/Makefile.in.orig	Sun Dec 11 23:47:47 2005
-+++ src/irc/proxy/Makefile.in	Sun Mar 19 01:28:02 2006
-@@ -129,7 +129,7 @@ module_LTLIBRARIES = libirc_proxy.la
- INCLUDES =  	-I$(top_srcdir)/src 	-I$(top_srcdir)/src/core/ 	-I$(top_srcdir)/src/irc/core/ 	$(GLIB_CFLAGS)
- 
+$OpenBSD: patch-src_irc_proxy_Makefile_in,v 1.3 2007/05/16 19:29:11 martynas Exp $
+--- src/irc/proxy/Makefile.in.orig	Sat Apr 28 20:40:31 2007
++++ src/irc/proxy/Makefile.in	Sat Apr 28 20:36:44 2007
+@@ -244,7 +244,7 @@ INCLUDES = \
+ 	-I$(top_srcdir)/src/irc/core/ \
+ 	$(GLIB_CFLAGS)
  
 -libirc_proxy_la_LDFLAGS = -module
 +libirc_proxy_la_LDFLAGS = -module -avoid-version
- 
  libirc_proxy_la_DEPENDENCIES = libirc_proxy.a
- 
+ libirc_proxy_la_SOURCES = \
+ 	proxy.c \
diff --git a/net/irssi/patches/patch-src_perl_Makefile_in b/net/irssi/patches/patch-src_perl_Makefile_in
index bf516021442..f3bff92dcec 100644
--- a/net/irssi/patches/patch-src_perl_Makefile_in
+++ b/net/irssi/patches/patch-src_perl_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_perl_Makefile_in,v 1.1 2006/04/18 20:30:03 steven Exp $
---- src/perl/Makefile.in.orig	Fri Apr  7 12:37:34 2006
-+++ src/perl/Makefile.in	Fri Apr  7 12:39:34 2006
-@@ -136,7 +136,7 @@ EXTRA_LTLIBRARIES =  	libperl_core.la li
- libperl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
- libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
- 
--INCLUDES =  	-I$(top_srcdir)/src 	-I$(top_srcdir)/src/core 	-I$(top_srcdir)/src/fe-common/core 	$(GLIB_CFLAGS) 	-DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" 	-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" 	-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) 	$(PERL_CFLAGS)
-+INCLUDES =  	-I$(top_srcdir)/src 	-I$(top_srcdir)/src/core 	-I$(top_srcdir)/src/fe-common/core 	$(GLIB_CFLAGS) 	-DSCRIPTDIR=\""$(datadir)/examples/irssi/scripts"\" 	-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" 	-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) 	$(PERL_CFLAGS)	-DSYSCONFDIR=\""$(sysconfdir)"\"
- 
- 
- perl_sources =  	perl-core.c 	perl-common.c 	perl-signals.c 	perl-sources.c
+$OpenBSD: patch-src_perl_Makefile_in,v 1.2 2007/05/16 19:29:11 martynas Exp $
+--- src/perl/Makefile.in.orig	Wed Apr 25 21:14:36 2007
++++ src/perl/Makefile.in	Sun May 13 01:42:11 2007
+@@ -266,7 +266,7 @@ INCLUDES = \
+ 	-I$(top_srcdir)/src/core \
+ 	-I$(top_srcdir)/src/fe-common/core \
+ 	$(GLIB_CFLAGS) \
+-	-DSCRIPTDIR=\""$(datadir)/irssi/scripts"\" \
++	-DSCRIPTDIR=\""$(sysconfdir)/irssi/scripts"\" \
+ 	-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
+ 	-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
+ 	$(PERL_CFLAGS)
diff --git a/net/irssi/patches/patch-src_perl_perl-core_c b/net/irssi/patches/patch-src_perl_perl-core_c
deleted file mode 100644
index fbf3a830991..00000000000
--- a/net/irssi/patches/patch-src_perl_perl-core_c
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_perl_perl-core_c,v 1.1 2006/04/18 20:30:03 steven Exp $
---- src/perl/perl-core.c.orig	Fri Apr  7 12:56:00 2006
-+++ src/perl/perl-core.c	Fri Apr  7 13:06:09 2006
-@@ -370,12 +370,17 @@ char *perl_script_get_path(const char *n
- 	/* check from ~/.irssi/scripts/ */
- 	path = g_strdup_printf("%s/scripts/%s", get_irssi_dir(), file);
- 	if (stat(path, &statbuf) != 0) {
--		/* check from SCRIPTDIR */
-+		/* check from SYSCONFDIR and SCRIPTDIR */
- 		g_free(path);
--		path = g_strdup_printf(SCRIPTDIR"/%s", file);
-+		/* path = g_strdup_printf(SCRIPTDIR"/%s", file); */
-+		path = g_strdup_printf(SYSCONFDIR"/irssi/scripts/%s", file);
- 		if (stat(path, &statbuf) != 0) {
- 			g_free(path);
--			path = NULL;
-+			path = g_strdup_printf(SCRIPTDIR"/%s", file);
-+			if (stat(path, &statbuf) != 0) {
-+				g_free(path);
-+				path = NULL;
-+			}
- 		}
- 	}
- 	g_free(file);
diff --git a/net/irssi/patches/patch-src_perl_perl-fe_c b/net/irssi/patches/patch-src_perl_perl-fe_c
deleted file mode 100644
index 7fd1466a506..00000000000
--- a/net/irssi/patches/patch-src_perl_perl-fe_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_perl_perl-fe_c,v 1.1 2006/04/18 20:30:03 steven Exp $
---- src/perl/perl-fe.c.orig	Wed Oct 19 04:13:21 2005
-+++ src/perl/perl-fe.c	Fri Apr  7 13:43:29 2006
-@@ -199,6 +199,7 @@ static void sig_complete_load(GList **li
- 	/* completing filename parameter for /SCRIPT LOAD */
- 	user_dir = g_strdup_printf("%s/scripts", get_irssi_dir());
- 	*list = filename_complete(word, user_dir);
-+	*list = g_list_concat(*list, filename_complete(word, SYSCONFDIR"/irssi/scripts"));
- 	*list = g_list_concat(*list, filename_complete(word, SCRIPTDIR));
-         g_free(user_dir);
- 
diff --git a/net/irssi/pkg/DESCR b/net/irssi/pkg/DESCR
index b77fc94941e..37546eb43b6 100644
--- a/net/irssi/pkg/DESCR
+++ b/net/irssi/pkg/DESCR
@@ -1,7 +1,8 @@
-Irssi is a modular IRC client that currently has only text mode user
-interface, but 80-90% of the code isn't text mode specific, so other UIs could
-be created pretty easily. Also, Irssi isn't really even IRC specific anymore,
-there's already a working SILC module available. Support for other protocols
+Irssi is a modular IRC client that currently has only text mode
+user interface, but 80-90% of the code isn't text mode specific,
+so other UIs could be created pretty easily. Also, Irssi isn't
+really even IRC specific anymore, there's already a working SILC
+module available at net/irssi-silc. Support for other protocols
 like ICQ could be created some day too.
 
 Flavor:	socks support for dante socks firewall implementation
diff --git a/net/irssi/pkg/PLIST b/net/irssi/pkg/PLIST
index 401bf3abf1c..58d1d649a48 100644
--- a/net/irssi/pkg/PLIST
+++ b/net/irssi/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2006/04/18 20:30:03 steven Exp $
+@comment $OpenBSD: PLIST,v 1.15 2007/05/16 19:29:11 martynas Exp $
 bin/irssi
 lib/irssi/
 lib/irssi/modules/
@@ -42,19 +42,33 @@ share/examples/irssi/irssi.conf
 share/examples/irssi/scripts/
 @sample ${SYSCONFDIR}/irssi/scripts/
 share/examples/irssi/scripts/autoop.pl
+@sample ${SYSCONFDIR}/irssi/scripts/autoop.pl
 share/examples/irssi/scripts/autorejoin.pl
+@sample ${SYSCONFDIR}/irssi/scripts/autorejoin.pl
 share/examples/irssi/scripts/buf.pl
+@sample ${SYSCONFDIR}/irssi/scripts/buf.pl
 share/examples/irssi/scripts/command.pl
+@sample ${SYSCONFDIR}/irssi/scripts/command.pl
 share/examples/irssi/scripts/dns.pl
+@sample ${SYSCONFDIR}/irssi/scripts/dns.pl
 share/examples/irssi/scripts/kills.pl
+@sample ${SYSCONFDIR}/irssi/scripts/kills.pl
 share/examples/irssi/scripts/mail.pl
+@sample ${SYSCONFDIR}/irssi/scripts/mail.pl
 share/examples/irssi/scripts/mlock.pl
+@sample ${SYSCONFDIR}/irssi/scripts/mlock.pl
 share/examples/irssi/scripts/msg-event.pl
+@sample ${SYSCONFDIR}/irssi/scripts/msg-event.pl
 share/examples/irssi/scripts/quitmsg.pl
+@sample ${SYSCONFDIR}/irssi/scripts/quitmsg.pl
 share/examples/irssi/scripts/redirect.pl
+@sample ${SYSCONFDIR}/irssi/scripts/redirect.pl
 share/examples/irssi/scripts/scriptassist.pl
+@sample ${SYSCONFDIR}/irssi/scripts/scriptassist.pl
 share/examples/irssi/scripts/splitlong.pl
+@sample ${SYSCONFDIR}/irssi/scripts/splitlong.pl
 share/examples/irssi/scripts/usercount.pl
+@sample ${SYSCONFDIR}/irssi/scripts/usercount.pl
 share/examples/irssi/themes/
 @sample ${SYSCONFDIR}/irssi/themes/
 share/examples/irssi/themes/colorless.theme