diff --git a/irc/libircclient/Makefile b/irc/libircclient/Makefile
index 50ad25e84a49..e0e4be5e7f63 100644
--- a/irc/libircclient/Makefile
+++ b/irc/libircclient/Makefile
@@ -6,17 +6,27 @@
 #
 
 PORTNAME=	libircclient
-PORTVERSION=	1.3
+PORTVERSION=	1.6
 CATEGORIES=	irc devel
 MASTER_SITES=	SF
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	An IRC library to create IRC clients
 
+OPTIONS=	SSL	"Build with SSL Support" on \
+		IPV6	"Build with IPv6 Support" on
+
+BUILD_WRKSRC=	${WRKSRC}/src
 GNU_CONFIGURE=	yes
 
-do-build:
-	@${MAKE} -C ${WRKSRC}/src/
+.if !defined(WITHOUT_SSL)
+CONFIGURE_ARGS+=	--enable-openssl
+USE_OPENSSL=	yes
+.endif
+
+.if !defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/include/libircclient.h ${PREFIX}/include
diff --git a/irc/libircclient/distinfo b/irc/libircclient/distinfo
index 87b8e4ff2554..90503e5560cf 100644
--- a/irc/libircclient/distinfo
+++ b/irc/libircclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libircclient-1.3.tar.gz) = 8c97284dd9352d3180851c334371e878580917b5b58916b96a13fab4b5c3f822
-SIZE (libircclient-1.3.tar.gz) = 284248
+SHA256 (libircclient-1.6.tar.gz) = 6c511923023398bcd7627cf3305054befacf6874203cb0de36bdbe658779e953
+SIZE (libircclient-1.6.tar.gz) = 392788
diff --git a/irc/libircclient/pkg-plist b/irc/libircclient/pkg-plist
index cfd49101d43f..5dc7652ec863 100644
--- a/irc/libircclient/pkg-plist
+++ b/irc/libircclient/pkg-plist
@@ -11,18 +11,20 @@ lib/libircclient.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ircftp.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/irctest.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spammer.c
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/ircmud
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/files.html
 %%PORTDOCS%%%%DOCSDIR%%/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/globals_0x6c.html
 %%PORTDOCS%%%%DOCSDIR%%/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/globals_func.html
 %%PORTDOCS%%%%DOCSDIR%%/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/group__colors.html
 %%PORTDOCS%%%%DOCSDIR%%/group__common.html
 %%PORTDOCS%%%%DOCSDIR%%/group__conndisc.html
 %%PORTDOCS%%%%DOCSDIR%%/group__contexts.html
@@ -47,9 +49,13 @@ lib/libircclient.a
 %%PORTDOCS%%%%DOCSDIR%%/libirc__events_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/libirc__options_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/libirc__rfcnumeric_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/libircclient_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/pagefaq.html
+%%PORTDOCS%%%%DOCSDIR%%/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/structirc__callbacks__t.html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/tab_b.gif
+%%PORTDOCS%%%%DOCSDIR%%/tab_l.gif
+%%PORTDOCS%%%%DOCSDIR%%/tab_r.gif
+%%PORTDOCS%%%%DOCSDIR%%/tabs.css
+%%PORTDOCS%%@dirrm %%DOCSDIR%%