diff --git a/irc/nethirc/Makefile b/irc/nethirc/Makefile
index 749b4ab4238c..436a83ec5f17 100644
--- a/irc/nethirc/Makefile
+++ b/irc/nethirc/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	NetHirc
-PORTVERSION=	0.7
+PORTVERSION=	0.94
 CATEGORIES=	irc
-MASTER_SITES=	ftp://ftp.nog.net/pub/tony/nethirc/old/
+MASTER_SITES=	ftp://ftp.nog.net/pub/tony/nethirc/
 
 MAINTAINER=	matt_mills@btopenworld.com
 COMMENT=	Perl-based IRC client that uses Net::IRC
 
-RUN_DEPENDS=	${SITE_PERL}/Net/IRC.pm:${PORTSDIR}/irc/p5-IRC
+BUILD_DEPENDS=	${SITE_PERL}/POE/Component/IRC.pm:${PORTSDIR}/irc/p5-POE-Component-IRC \
+		${SITE_PERL}/String/Format.pm:${PORTSDIR}/textproc/p5-String-Format \
+		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MANCOMPRESSED=	no
 MAN1=		nethirc.pl.1
-MAN3=		NetHirc.3 nethirc.3
+MAN3=		NetHirc.3
 
 .include <bsd.port.pre.mk>
 
diff --git a/irc/nethirc/distinfo b/irc/nethirc/distinfo
index 8219741686ca..5cebbbc0b44b 100644
--- a/irc/nethirc/distinfo
+++ b/irc/nethirc/distinfo
@@ -1,3 +1,3 @@
-MD5 (NetHirc-0.7.tar.gz) = 461d967dae3c91f4403b472b3ac577c1
-SHA256 (NetHirc-0.7.tar.gz) = 3aa5cb273dedbbfd1a0159a385b0a705cf116ee8fc9ac391dcdd1094556d3d45
-SIZE (NetHirc-0.7.tar.gz) = 32476
+MD5 (NetHirc-0.94.tar.gz) = f1e9b699601171878b1675795dd300f2
+SHA256 (NetHirc-0.94.tar.gz) = 0ab2158411b3baaf72172b40165c990e849192806ce303cd144479ccf8857ece
+SIZE (NetHirc-0.94.tar.gz) = 41410
diff --git a/irc/nethirc/pkg-descr b/irc/nethirc/pkg-descr
index f94cbc2a82fe..550c4437ee77 100644
--- a/irc/nethirc/pkg-descr
+++ b/irc/nethirc/pkg-descr
@@ -1,4 +1,4 @@
 Console IRC client written in Perl, based on widely popular NetHack game.
  
-WWW: http://www.nog.net/~tony/
+WWW: http://www.nog.net/~tony/warez/nethirc.shtml
 Author: Tony Monroe <tony@nog.net>
diff --git a/irc/nethirc/pkg-plist b/irc/nethirc/pkg-plist
index e5039a40f88d..f1bb5793dda5 100644
--- a/irc/nethirc/pkg-plist
+++ b/irc/nethirc/pkg-plist
@@ -1,17 +1,23 @@
 bin/nethirc
 bin/nethirc.pl
-%%SITE_PERL%%/NetHirc/Channel.pm
-%%SITE_PERL%%/NetHirc/Handlers.pm
-%%SITE_PERL%%/NetHirc/Helpers.pm
-%%SITE_PERL%%/NetHirc/State.pm
-%%SITE_PERL%%/NetHirc/Terminal.pm
-%%SITE_PERL%%/NetHirc/Formats.pm
-%%SITE_PERL%%/NetHirc/Server.pm
-%%SITE_PERL%%/NetHirc/StatsDB.pm
-%%SITE_PERL%%/NetHirc/TerminalEvent.pm
+%%SITE_PERL%%/NetHirc/Adventurer.pm
+%%SITE_PERL%%/NetHirc/Amusements.pm
 %%SITE_PERL%%/NetHirc/BigBrother.pm
+%%SITE_PERL%%/NetHirc/Commands.pm
+%%SITE_PERL%%/NetHirc/Counter.pm
+%%SITE_PERL%%/NetHirc/Database.pm
+%%SITE_PERL%%/NetHirc/Debug.pm
+%%SITE_PERL%%/NetHirc/Handlers.pm
+%%SITE_PERL%%/NetHirc/Inventory.pm
+%%SITE_PERL%%/NetHirc/Log.pm
+%%SITE_PERL%%/NetHirc/Pipe.pm
+%%SITE_PERL%%/NetHirc/Server.pm
+%%SITE_PERL%%/NetHirc/Shell.pm
+%%SITE_PERL%%/NetHirc/Stats.pm
+%%SITE_PERL%%/NetHirc/Terminal.pm
+%%SITE_PERL%%/NetHirc/Totalitarian.pm
+%%SITE_PERL%%/NetHirc/Util.pm
 %%SITE_PERL%%/NetHirc.pm
-%%SITE_PERL%%/nethirc.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetHirc/.packlist
 @dirrm %%SITE_PERL%%/NetHirc
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetHirc