diff --git a/elementary-calculator/Makefile b/elementary-calculator/Makefile
index f3519b7c88..68db895519 100644
--- a/elementary-calculator/Makefile
+++ b/elementary-calculator/Makefile
@@ -3,14 +3,12 @@
 DISTNAME=	calculator-1.5.5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=elementary/}
-GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/elementary/calculator/
 COMMENT=	Elementary Calculator
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=			${WRKDIR}/calculator-1.5.5
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS=		pkg-config
 USE_CMAKE=		yes
diff --git a/elementary-code/Makefile b/elementary-code/Makefile
index 9d6bf6d995..acc5c323ef 100644
--- a/elementary-code/Makefile
+++ b/elementary-code/Makefile
@@ -1,19 +1,14 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	code
-GITHUB_TAG=	3.4.1
-DISTNAME=	3.4.1
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
+DISTNAME=	code-3.4.1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=elementary/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/elementary/code/
 COMMENT=	Elementory code editor
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=			${WRKDIR}/code-3.4.1
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS=		pkg-config
 USE_CMAKE=		yes
diff --git a/elementary-code/distinfo b/elementary-code/distinfo
index 6c356f0287..f47252c301 100644
--- a/elementary-code/distinfo
+++ b/elementary-code/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (code/3.4.1.tar.gz) = d73b03a826869b11c2d531b879c3650ba6c3450b
-RMD160 (code/3.4.1.tar.gz) = ae6aa1f54ff25b3d3cdd0820f4d687b1091266bf
-SHA512 (code/3.4.1.tar.gz) = ea98f2e2a08e9458a81fd74690ea6603dedf445b7e3d775af15853ea9cb2fcb442068a25c17cb75ec0b05f22a14e5ccee0876a4cdc820b19061a4e9cdff73f17
-Size (code/3.4.1.tar.gz) = 1468212 bytes
+SHA1 (code-3.4.1.tar.gz) = d73b03a826869b11c2d531b879c3650ba6c3450b
+RMD160 (code-3.4.1.tar.gz) = ae6aa1f54ff25b3d3cdd0820f4d687b1091266bf
+SHA512 (code-3.4.1.tar.gz) = ea98f2e2a08e9458a81fd74690ea6603dedf445b7e3d775af15853ea9cb2fcb442068a25c17cb75ec0b05f22a14e5ccee0876a4cdc820b19061a4e9cdff73f17
+Size (code-3.4.1.tar.gz) = 1468212 bytes
diff --git a/granite/Makefile b/granite/Makefile
index 5812354482..fbda438f67 100644
--- a/granite/Makefile
+++ b/granite/Makefile
@@ -3,14 +3,12 @@
 DISTNAME=	granite-5.5.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=elementary/}
-GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/elementary/granite/
 COMMENT=	Elementary OS Gtk+/GLib extension library
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=			${WRKDIR}/granite-5.5.0
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS=		pkg-config
 USE_CMAKE=		yes