diff --git a/www/libepc/Makefile b/www/libepc/Makefile
index 7152628e2cb6..2b872d90d459 100644
--- a/www/libepc/Makefile
+++ b/www/libepc/Makefile
@@ -1,26 +1,32 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libepc
 PORTVERSION=	0.3.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	GNOME
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	The Easy Publish and Consume library
 
-LIB_DEPENDS=	uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup \
-		avahi-ui.0:${PORTSDIR}/net/avahi-gtk
+LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+		libavahi-ui.so:${PORTSDIR}/net/avahi-gtk
 
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
-USE_GNOME=	gnomeprefix gnomehack gtk20
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USE_GNOME=	gnomeprefix gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-static
 
+post-patch:
+	@${REINPLACE_CMD} \
+		-e '/^examples_server_credentials_LDADD =/s/$$/ $$(LIBEPC_UI_LIBS)/' \
+		-e '/^examples_service_browser_LDADD =/s/$$/ $$(LIBEPC_LIBS)/' \
+		-e '/^tests_test_progress_hooks_LDADD =/s/$$/ $$(LIBEPC_UI_LIBS)/' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/www/libepc/pkg-plist b/www/libepc/pkg-plist
index be26a9d7a3ad..384f1427ed9b 100644
--- a/www/libepc/pkg-plist
+++ b/www/libepc/pkg-plist
@@ -1,76 +1,76 @@
 include/libepc-1.0/libepc/consumer.h
 include/libepc-1.0/libepc/contents.h
 include/libepc-1.0/libepc/dispatcher.h
 include/libepc-1.0/libepc/enums.h
 include/libepc-1.0/libepc/marshal.h
 include/libepc-1.0/libepc/protocol.h
 include/libepc-1.0/libepc/publisher.h
 include/libepc-1.0/libepc/service-info.h
 include/libepc-1.0/libepc/service-monitor.h
 include/libepc-1.0/libepc/service-type.h
 include/libepc-1.0/libepc/shell.h
 include/libepc-1.0/libepc/tls.h
 include/libepc-ui-1.0/libepc-ui/password-dialog.h
 include/libepc-ui-1.0/libepc-ui/progress-window.h
 lib/libepc-1.0.a
-lib/libepc-1.0.la
 lib/libepc-1.0.so
 lib/libepc-1.0.so.2
+lib/libepc-1.0.so.2.0.0
 lib/libepc-ui-1.0.a
-lib/libepc-ui-1.0.la
 lib/libepc-ui-1.0.so
 lib/libepc-ui-1.0.so.2
+lib/libepc-ui-1.0.so.2.0.0
 libdata/pkgconfig/libepc-1.0.pc
 libdata/pkgconfig/libepc-ui-1.0.pc
 %%DOCSDIR%%/EpcConsumer.html
 %%DOCSDIR%%/EpcDispatcher.html
 %%DOCSDIR%%/EpcPasswordDialog.html
 %%DOCSDIR%%/EpcProgressWindow.html
 %%DOCSDIR%%/EpcPublisher.html
 %%DOCSDIR%%/EpcServiceMonitor.html
 %%DOCSDIR%%/consuming.html
 %%DOCSDIR%%/dns-sd-support.html
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
 %%DOCSDIR%%/internal-api.html
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/libepc-1.0.devhelp
 %%DOCSDIR%%/libepc-1.0.devhelp2
 %%DOCSDIR%%/libepc-10-EpcAuthContext.html
 %%DOCSDIR%%/libepc-10-EpcContents.html
 %%DOCSDIR%%/libepc-10-EpcProtocol.html
 %%DOCSDIR%%/libepc-10-EpcServiceInfo.html
 %%DOCSDIR%%/libepc-10-EpcServiceType.html
 %%DOCSDIR%%/libepc-10-EpcShell.html
 %%DOCSDIR%%/libepc-10-EpcTls.html
 %%DOCSDIR%%/publishing.html
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
 %%DOCSDIR%%/widgets.html
 share/locale/ar/LC_MESSAGES/libepc.mo
 share/locale/ca/LC_MESSAGES/libepc.mo
 share/locale/cs/LC_MESSAGES/libepc.mo
 share/locale/da/LC_MESSAGES/libepc.mo
 share/locale/de/LC_MESSAGES/libepc.mo
 share/locale/el/LC_MESSAGES/libepc.mo
 share/locale/en_GB/LC_MESSAGES/libepc.mo
 share/locale/es/LC_MESSAGES/libepc.mo
 share/locale/fi/LC_MESSAGES/libepc.mo
 share/locale/fr/LC_MESSAGES/libepc.mo
 share/locale/gl/LC_MESSAGES/libepc.mo
 share/locale/it/LC_MESSAGES/libepc.mo
 share/locale/ja/LC_MESSAGES/libepc.mo
 share/locale/nb/LC_MESSAGES/libepc.mo
 share/locale/pl/LC_MESSAGES/libepc.mo
 share/locale/pt_BR/LC_MESSAGES/libepc.mo
 share/locale/sl/LC_MESSAGES/libepc.mo
 share/locale/sv/LC_MESSAGES/libepc.mo
 share/locale/th/LC_MESSAGES/libepc.mo
 share/locale/zh_CN/LC_MESSAGES/libepc.mo
 @dirrm %%DOCSDIR%%
 @dirrm include/libepc-ui-1.0/libepc-ui
 @dirrm include/libepc-ui-1.0
 @dirrm include/libepc-1.0/libepc
 @dirrm include/libepc-1.0