diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index fe2906102f84..593f2ffd6e1d 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	transmisson-remote-gui
-PORTVERSION=	2.2
+PORTVERSION=	3.1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	transgui-${PORTVERSION}-src
@@ -17,19 +17,30 @@ COMMENT=	Remote GUI for transmission daemon
 BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus
 RUN_DEPENDS=	transmission-daemon:${PORTSDIR}/net-p2p/transmission-daemon
 
-USE_GMAKE=	yes
+PROJECTHOST=	bsdistfiles
+
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 USE_FPC=	fcl-net
 
 WRKSRC=		${WRKDIR}/TransGUI
 PLIST_FILES=	bin/transgui
 SUB_FILES=	pkg-message
 
+LAZARUS_PROJECT_FILE=	transgui.lpi
+LAZBUILD_CMD=		${LOCALBASE}/bin/lazbuild
+
 .include <bsd.port.pre.mk>
 
-do-install:
+.if exists(${LOCALBASE}/bin/lazbuild)
+LCL_PLATFORM!=	${SED} -e 1d -e 's/^LCL_PLATFORM=\(.*\).*$$/\1/' ${LOCALBASE}/etc/lazbuild.cfg
+.endif
+
+do-build:
 	@cd ${WRKSRC} && \
+		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} ${LAZARUS_PROJECT_FILE}
+
+do-install:
+	@cd ${WRKSRC}/units && \
 		${INSTALL_PROGRAM} transgui ${PREFIX}/bin
 
 post-install:
diff --git a/net-p2p/transmission-remote-gui/distinfo b/net-p2p/transmission-remote-gui/distinfo
index 2501aee55063..973fb9b6fe29 100644
--- a/net-p2p/transmission-remote-gui/distinfo
+++ b/net-p2p/transmission-remote-gui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transgui-2.2-src.zip) = 184df4f7f60069a2a452fd76fa3893066633012422b4c9f0b03b6f1d62e3d1fc
-SIZE (transgui-2.2-src.zip) = 803580
+SHA256 (transgui-3.1-src.zip) = 5e10504e13aa95e228e4b8ed5dafc8b12b7c37a747ad3dc49899f89c7474cdb6
+SIZE (transgui-3.1-src.zip) = 822094
diff --git a/net-p2p/transmisson-remote-gui/Makefile b/net-p2p/transmisson-remote-gui/Makefile
index fe2906102f84..593f2ffd6e1d 100644
--- a/net-p2p/transmisson-remote-gui/Makefile
+++ b/net-p2p/transmisson-remote-gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	transmisson-remote-gui
-PORTVERSION=	2.2
+PORTVERSION=	3.1
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	transgui-${PORTVERSION}-src
@@ -17,19 +17,30 @@ COMMENT=	Remote GUI for transmission daemon
 BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus
 RUN_DEPENDS=	transmission-daemon:${PORTSDIR}/net-p2p/transmission-daemon
 
-USE_GMAKE=	yes
+PROJECTHOST=	bsdistfiles
+
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 USE_FPC=	fcl-net
 
 WRKSRC=		${WRKDIR}/TransGUI
 PLIST_FILES=	bin/transgui
 SUB_FILES=	pkg-message
 
+LAZARUS_PROJECT_FILE=	transgui.lpi
+LAZBUILD_CMD=		${LOCALBASE}/bin/lazbuild
+
 .include <bsd.port.pre.mk>
 
-do-install:
+.if exists(${LOCALBASE}/bin/lazbuild)
+LCL_PLATFORM!=	${SED} -e 1d -e 's/^LCL_PLATFORM=\(.*\).*$$/\1/' ${LOCALBASE}/etc/lazbuild.cfg
+.endif
+
+do-build:
 	@cd ${WRKSRC} && \
+		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} ${LAZARUS_PROJECT_FILE}
+
+do-install:
+	@cd ${WRKSRC}/units && \
 		${INSTALL_PROGRAM} transgui ${PREFIX}/bin
 
 post-install:
diff --git a/net-p2p/transmisson-remote-gui/distinfo b/net-p2p/transmisson-remote-gui/distinfo
index 2501aee55063..973fb9b6fe29 100644
--- a/net-p2p/transmisson-remote-gui/distinfo
+++ b/net-p2p/transmisson-remote-gui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transgui-2.2-src.zip) = 184df4f7f60069a2a452fd76fa3893066633012422b4c9f0b03b6f1d62e3d1fc
-SIZE (transgui-2.2-src.zip) = 803580
+SHA256 (transgui-3.1-src.zip) = 5e10504e13aa95e228e4b8ed5dafc8b12b7c37a747ad3dc49899f89c7474cdb6
+SIZE (transgui-3.1-src.zip) = 822094