diff --git a/deskutils/dstask/Makefile b/deskutils/dstask/Makefile
index aef38f9afff2..80406879754c 100644
--- a/deskutils/dstask/Makefile
+++ b/deskutils/dstask/Makefile
@@ -2,9 +2,13 @@
 
 PORTNAME=	dstask
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.23
+DISTVERSION=	0.23.2
 CATEGORIES=	deskutils
 
+# Temporary patch to fix a build issue in released version
+PATCHFILES=	947deb069256bcec020756ce052ccc718e68cfb5.diff:-p1
+PATCH_SITES=	https://github.com/naggie/dstask/commit/
+
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Single binary terminal-based TODO manager with git-based sync
 
@@ -14,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	git:devel/git
 
 USES=		go:modules
-GO_TARGET=	./cmd/dstask.go
+GO_TARGET=	cmd/dstask/main.go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	naggie
@@ -25,7 +29,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 		share/zsh/site-functions/_${PORTNAME}
 
 post-install:
-	@${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.go \
+	@${MV} ${STAGEDIR}${PREFIX}/bin/${GO_TARGET:T} \
 		 ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
diff --git a/deskutils/dstask/distinfo b/deskutils/dstask/distinfo
index 4ac952dced84..2c161b70d38b 100644
--- a/deskutils/dstask/distinfo
+++ b/deskutils/dstask/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1603644718
-SHA256 (naggie-dstask-v0.23_GH0.tar.gz) = 777ad9cbd148fc613a316126280d2327a1b0bcc2f0b2f228e19cde65220b0ecd
-SIZE (naggie-dstask-v0.23_GH0.tar.gz) = 3079128
+TIMESTAMP = 1605977365
+SHA256 (naggie-dstask-v0.23.2_GH0.tar.gz) = 30665d3f0f1e268af6eff681e331557f56273bf6ac7491b489c50725b55ef293
+SIZE (naggie-dstask-v0.23.2_GH0.tar.gz) = 2537726
+SHA256 (947deb069256bcec020756ce052ccc718e68cfb5.diff) = 74583b543ff10465c85258e3235a918ac2de387d06b2c5cbbc6bd5a2d219d8b1
+SIZE (947deb069256bcec020756ce052ccc718e68cfb5.diff) = 463671