diff --git a/graphics/cstitch/Makefile b/graphics/cstitch/Makefile
index 09f5d1051a2..02c3afe1df5 100644
--- a/graphics/cstitch/Makefile
+++ b/graphics/cstitch/Makefile
@@ -1,20 +1,21 @@
 COMMENT =		convert images to cross stitch patterns
 
 GH_ACCOUNT =		kleintom
-GH_PROJECT =		cstitch
+GH_PROJECT =		Cstitch
 GH_TAGNAME =		0.9.8
-REVISION =		6
-
-DISTFILES=		${DISTNAME}.tar.gz
-DISTFILES.icons =	${DISTNAME}-icons{icons}.zip
+REVISION =		7
+PKGNAME =		${DISTNAME:L}
 
+DISTFILES.icons =	${DISTNAME:L}-icons{icons}.zip
 SITES.icons =	https://sourceforge.net/projects/cstitch/files/Cstitch/Icons/
 
 # needs c++ and python
 COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c c++
 
-MODULES =		devel/qmake lang/python x11/qt5
+MODULES =		devel/qmake \
+			lang/python \
+			x11/qt5
 
 MODPY_RUNDEP =		No
 
@@ -33,7 +34,6 @@ WANTLIB += ${COMPILER_LIBCXX}
 
 RUN_DEPENDS =		devel/desktop-file-utils x11/gtk+4,-guic
 
-WRKDIST = ${WRKDIR}/Cstitch-${GH_TAGNAME}
 EXTRACT_CASES += *icons.zip) \
 	${UNZIP} -qo ${FULLDISTDIR}/$$archive -d \
 	${WRKDIST}/icons/;;
diff --git a/graphics/cstitch/distinfo b/graphics/cstitch/distinfo
index cd687f6d2b3..996a16c3962 100644
--- a/graphics/cstitch/distinfo
+++ b/graphics/cstitch/distinfo
@@ -1,4 +1,4 @@
+SHA256 (Cstitch-0.9.8.tar.gz) = 5Ce4+jjlmAtUN7d+6XPBxNHWZXIvGJztukuqrsKlkkk=
 SHA256 (cstitch-0.9.8-icons.zip) = k5Daa+IY6tOF8dV4kRKLyOWT+XooYCbbfgUpyjywJOI=
-SHA256 (cstitch-0.9.8.tar.gz) = 5Ce4+jjlmAtUN7d+6XPBxNHWZXIvGJztukuqrsKlkkk=
+SIZE (Cstitch-0.9.8.tar.gz) = 337685
 SIZE (cstitch-0.9.8-icons.zip) = 45348
-SIZE (cstitch-0.9.8.tar.gz) = 337685