diff --git a/x11-clocks/stopwatch/Makefile b/x11-clocks/stopwatch/Makefile
index a6bae4d7617a..da186321f64f 100644
--- a/x11-clocks/stopwatch/Makefile
+++ b/x11-clocks/stopwatch/Makefile
@@ -12,17 +12,15 @@ MAINTAINER=	edwin@mavetju.org
 COMMENT=	Stopwatch enables hand timing much like a physical stopwatch
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.4
-USE_TK_RUN=	yes
-USE_TK_WRAPPER=	yes
+USES=		tk:run
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/stopwatch
 
-NO_STAGE=	yes
 post-patch:
-	${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/stopwatch
+	${REINPLACE_CMD} -e "s,/depot/path/wish,${WISH}," ${WRKSRC}/stopwatch
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/stopwatch ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/stopwatch ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/stopwatch/files/patch-stopwatch b/x11-clocks/stopwatch/files/patch-stopwatch
deleted file mode 100644
index 5fbfabbac6e4..000000000000
--- a/x11-clocks/stopwatch/files/patch-stopwatch
+++ /dev/null
@@ -1,8 +0,0 @@
---- stopwatch.orig	2008-08-28 11:19:38.000000000 +1000
-+++ stopwatch	2008-08-28 11:19:54.000000000 +1000
-@@ -1,4 +1,4 @@
--#!/depot/path/wish -f
-+#!%%LOCALBASE%%/bin/wish -f
- ######################################################################
- # Name: Stopwatch
- # Author: Don Libes <libes@nist.gov>