diff --git a/irc/py-irclib/Makefile b/irc/py-irclib/Makefile
index c448a089d794..0daa7b01faa4 100644
--- a/irc/py-irclib/Makefile
+++ b/irc/py-irclib/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	irclib
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 CATEGORIES=	irc python
-MASTER_SITES=	http://joel.rosdahl.net/hacks/ \
-		http://fallin.lv/distfiles/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	python-irclib
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	python-irclib-${PORTVERSION}
 
 MAINTAINER=	perky@fallin.lv
 
 USE_PYTHON=	yes
 
-PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
+PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} \
+		EXAMPLESDIR=${EXAMPLESDIR:S,^${PREFIX}/,,g}
 EXAMPLEFILES=	ircbot.py irccat irccat2 servermap testbot.py
 
 do-build:
@@ -27,9 +29,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/irclib.py* ${PYTHON_SITELIBDIR}/
 	@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
 .for file in ${EXAMPLEFILES}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/share/examples/${PORTNAME}/
+	@${INSTALL_SCRIPT} ${WRKSRC}/${file} ${EXAMPLESDIR}/
 .endfor
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/${PORTNAME}/
 
 .include <bsd.port.mk>
diff --git a/irc/py-irclib/distinfo b/irc/py-irclib/distinfo
index e74f0612014f..581acbff38a3 100644
--- a/irc/py-irclib/distinfo
+++ b/irc/py-irclib/distinfo
@@ -1 +1 @@
-MD5 (irclib-0.3.2.tar.gz) = 6c2e57685f1983f1999ca5d3ca70a7e8
+MD5 (python-irclib-0.3.3.tar.gz) = 5704e2115d1567783ab84ee5c57d93d0
diff --git a/irc/py-irclib/pkg-descr b/irc/py-irclib/pkg-descr
index f05d6bc6b6a4..6d734cb38cc6 100644
--- a/irc/py-irclib/pkg-descr
+++ b/irc/py-irclib/pkg-descr
@@ -4,4 +4,4 @@ a fairly thorough support for the basic IRC protocol and CTCP, but DCC
 connection support is not yet implemented. It actually does CTCP
 parsing exactly as the CTCP specifications describe it.
 
-WWW: http://joel.rosdahl.net/hacks/
+WWW: http://sourceforge.net/projects/python-irclib/
diff --git a/irc/py-irclib/pkg-plist b/irc/py-irclib/pkg-plist
index 6a02659fbe6c..59df2ae365f6 100644
--- a/irc/py-irclib/pkg-plist
+++ b/irc/py-irclib/pkg-plist
@@ -1,24 +1,9 @@
-share/doc/irclib/index.html
-share/doc/irclib/indices.html
-share/doc/irclib/ircbot.Channel.html
-share/doc/irclib/ircbot.IRCDict.html
-share/doc/irclib/ircbot.SingleServerIRCBot.html
-share/doc/irclib/ircbot.html
-share/doc/irclib/irclib.Connection.html
-share/doc/irclib/irclib.DCCConnection.html
-share/doc/irclib/irclib.Event.html
-share/doc/irclib/irclib.IRC.html
-share/doc/irclib/irclib.IRCError.html
-share/doc/irclib/irclib.ServerConnection.html
-share/doc/irclib/irclib.ServerConnectionError.html
-share/doc/irclib/irclib.SimpleIRCClient.html
-share/doc/irclib/irclib.html
-share/doc/irclib/pythondoc.css
-share/examples/irclib/ircbot.py
-share/examples/irclib/irccat
-share/examples/irclib/irccat2
-share/examples/irclib/servermap
-share/examples/irclib/testbot.py
+%%EXAMPLESDIR%%/ircbot.py
+%%EXAMPLESDIR%%/irccat
+%%EXAMPLESDIR%%/irccat2
+%%EXAMPLESDIR%%/servermap
+%%EXAMPLESDIR%%/testbot.py
+@dirrm %%EXAMPLESDIR%%
 @cwd %%LOCALBASE%%
 %%PYTHON_SITELIBDIR%%/irclib.py
 %%PYTHON_SITELIBDIR%%/irclib.pyc