diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 892c993fc9c9..ae15e99d151b 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tsclient
 PORTVERSION=	0.150
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net gnome
 MASTER_SITES=	SF
 
@@ -16,11 +16,7 @@ COMMENT=	A GNOME 2 frontend for rdesktop and vncviewer
 
 RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop
 
-OPTIONS=	GNOME		"Build with gnome support" on \
-		TIGHTVNC	"vncviewer support" off \
-		XNEST		"X via Xnest support (experimental)" off
-
-USE_AUTOTOOLS=	libtool:22 automake:19 autoconf:262
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
@@ -32,7 +28,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-
 MAN1=		tsclient.1
 PORTDOCS=	COPYING NEWS README
 
-.include <bsd.port.pre.mk>
+OPTIONS=	GNOME		"Build with gnome support" on \
+		TIGHTVNC	"vncviewer support" off \
+		XNEST		"X via Xnest support (experimental)" off
+
+.include <bsd.port.options.mk>
 
 .if defined(WITH_GNOME)
 USE_GNOME+=	gnomeprefix gnomehack gnomepanel libgnomeui 
@@ -48,11 +48,11 @@ RUN_DEPENDS+=	vncviewer:${PORTSDIR}/net/tightvnc
 RUN_DEPENDS+=	Xnest:${X_NESTSERVER_PORT}
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^man1dir *=/ s,datadir,prefix,g' \
-		${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
-		${WRKSRC}/aclocal.m4
+		${WRKSRC}/Makefile.in
 
 post-install:
 	@${LN} -sf ${PREFIX}/share/pixmaps/tsclient/tsclient.png \
diff --git a/net/tsclient/pkg-plist b/net/tsclient/pkg-plist
index 12f67fb09295..27d07943d4ce 100644
--- a/net/tsclient/pkg-plist
+++ b/net/tsclient/pkg-plist
@@ -1,5 +1,5 @@
 bin/tsclient
-lib/bonobo/servers/GNOME_TSClientApplet.server
+libdata/bonobo/servers/GNOME_TSClientApplet.server
 libexec/tsclient-applet
 share/application-registry/tsclient.applications
 share/applications/tsclient.desktop
@@ -69,4 +69,3 @@ share/pixmaps/tsclient/tsclient.png
 @dirrmtry share/locale/gr/LC_MESSAGES
 @dirrmtry share/locale/gr
 @dirrmtry share/applications
-@dirrmtry lib/bonobo/servers