diff --git a/cppzmq/Makefile b/cppzmq/Makefile
index 7676455a37..59c6b2f41f 100644
--- a/cppzmq/Makefile
+++ b/cppzmq/Makefile
@@ -1,12 +1,9 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	cppzmq
-GITHUB_TAG=	v4.6.0
-DISTNAME=	v4.6.0
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
-CATEGORIES=	# TODO: add primary category
+DISTNAME=	cppzmq-4.6.0
+CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=zeromq/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	root@zta.lk
 HOMEPAGE=	https://www.zeromq.org
diff --git a/cppzmq/distinfo b/cppzmq/distinfo
index 88f803a3ec..571b44c5cf 100644
--- a/cppzmq/distinfo
+++ b/cppzmq/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (cppzmq/v4.6.0.tar.gz) = 4acd8eb109c1a0a0f7cea3aa34c3585e555ca929
-RMD160 (cppzmq/v4.6.0.tar.gz) = 7bc3a08a64956b1d4c25868945a88c21aa6cd02a
-SHA512 (cppzmq/v4.6.0.tar.gz) = f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
-Size (cppzmq/v4.6.0.tar.gz) = 35078 bytes
+SHA1 (cppzmq-4.6.0.tar.gz) = 4acd8eb109c1a0a0f7cea3aa34c3585e555ca929
+RMD160 (cppzmq-4.6.0.tar.gz) = 7bc3a08a64956b1d4c25868945a88c21aa6cd02a
+SHA512 (cppzmq-4.6.0.tar.gz) = f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
+Size (cppzmq-4.6.0.tar.gz) = 35078 bytes