--- a/components/irssi/Makefile	Wed Jan 27 20:55:37 2016 -0800
+++ b/components/irssi/Makefile	Thu Jan 28 07:08:16 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -46,16 +46,29 @@
 # Part of the build just runs "cc" (not the path that configure finds).
 COMPONENT_BUILD_ENV +=  PATH=$(dir $(CC)):$(PATH)
 
+# Need 64-bit perl.
+PERL_VERSION = 5.20
+
+CONFIGURE_ENV += "ac_cv_path_perlpath=/usr/perl5/$(PERL_VERSION)/bin/perl"
+
+# Architecture specific perl subdirectory.
+PERL_ARCH_i386 = i86pc
+PERL_ARCH_sparc = sun4
+PERL_ARCH = $(PERL_ARCH_$(MACH))-solaris-thread-multi-64
+
+CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
+
+CONFIGURE_OPTIONS +=	--bindir=/usr/bin
 CONFIGURE_OPTIONS +=    --sysconfdir=/etc
 CONFIGURE_OPTIONS +=    --with-perl=yes
 CONFIGURE_OPTIONS +=    --with-proxy
 CONFIGURE_OPTIONS +=    --with-perl-lib=/usr/perl5/vendor_perl/$(PERL_VERSION)
 
-configure:	$(CONFIGURE_32)
+configure:	$(CONFIGURE_64)
 
-build:          $(BUILD_32)
+build:          $(BUILD_64)
 
-install:        $(INSTALL_32)
+install:        $(INSTALL_64)
 
 test:           $(NO_TESTS)
 
@@ -64,5 +77,5 @@
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/security/openssl
-REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += system/library

--- a/components/irssi/irssi.p5m	Wed Jan 27 20:55:37 2016 -0800
+++ b/components/irssi/irssi.p5m	Thu Jan 28 07:08:16 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -152,22 +152,18 @@
 file path=usr/include/irssi/src/irc/notifylist/notifylist.h
 file path=usr/include/irssi/src/lib-config/iconfig.h
 file path=usr/include/irssi/src/lib-config/module.h
-file path=usr/lib/irssi/modules/libirc_proxy.so
+file path=usr/lib/$(MACH64)/irssi/modules/libirc_proxy.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Irssi.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Irssi/Irc.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Irssi/TextUI.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Irssi/UI.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/.packlist
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/Irc/.packlist
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/Irc/Irc.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/Irc/Irc.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/Irssi.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/Irssi.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/TextUI/.packlist
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/TextUI/TextUI.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/TextUI/TextUI.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/UI/.packlist
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/UI/UI.bs
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Irssi/UI/UI.so
 file path=usr/share/doc/irssi/design.txt
 file path=usr/share/doc/irssi/faq.html