diff --git a/dns/blocky-amigan/distinfo b/dns/blocky-amigan/distinfo
deleted file mode 100644
index 7a325e4..0000000
--- a/dns/blocky-amigan/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1663205933
-SHA256 (go/dns_blocky-amigan/blocky-v0.19/go.mod) = 104ea489e877ff025d56ec0ea2f910b2e991f56f4a3b95fe26a3e7ddd318d2a2
-SIZE (go/dns_blocky-amigan/blocky-v0.19/go.mod) = 12460
diff --git a/dns/blocky-amigan/Makefile b/dns/blocky-devel/Makefile
similarity index 60%
rename from dns/blocky-amigan/Makefile
rename to dns/blocky-devel/Makefile
index d207362..76a74cd 100644
--- a/dns/blocky-amigan/Makefile
+++ b/dns/blocky-devel/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	blocky
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.21
-PORTREVISION=	6
+DISTVERSION=	development
+PORTVERSION=0.99
+PORTREVISION=	7
 CATEGORIES=	dns
-#MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
-MASTER_SITES=https://git.dynatron.me/amigan/blocky/raw/branch/debug/:gomod
+MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/development/:gomod
 DISTFILES=	go.mod:gomod
+NO_CHECKSUM=true
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Fast and lightweight DNS proxy as ad-blocker
+WWW=		https://0xerr0r.github.io/blocky/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
+USE_GITHUB=	yes
+GH_ACCOUNT=	0xERR0R
 USE_RC_SUBR=	blocky
 
-GO_MODULE=	pkg.dynatron.me/amigan/blocky
+GO_MODULE=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_TARGET=	main.go:${PREFIX}/sbin/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "-w -s \
 		-X github.com/0xERR0R/blocky/util.Version=${DISTVERSION} \
 		-X github.com/0xERR0R/blocky/util.BuildTime=`date '+%Y%m%d-%H%M%S'`"
+
 SUB_FILES=	pkg-message
 
-do-extract:
-		git clone https://git.dynatron.me/amigan/blocky.git work/blocky-v0.21
-		cd work/blocky-v0.21
-		git switch debug
-	
 post-install:
 		${INSTALL_DATA} ${FILESDIR}/blocky-config.yml.sample ${STAGEDIR}${PREFIX}/etc/blocky-config.yml.sample
 
diff --git a/dns/blocky-devel/distinfo b/dns/blocky-devel/distinfo
new file mode 100644
index 0000000..d11a83e
--- /dev/null
+++ b/dns/blocky-devel/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1674399278
+SHA256 (go/dns_blocky-amigan/0xERR0R-blocky-development_GH0/go.mod) = f03d4d2bf8d744fd0ac85d3e33ce00fccf95e48ed369c50bfe1cf7664807bb18
+SIZE (go/dns_blocky-amigan/0xERR0R-blocky-development_GH0/go.mod) = 5871
+SHA256 (go/dns_blocky-amigan/0xERR0R-blocky-development_GH0/0xERR0R-blocky-development_GH0.tar.gz) = 23ea967dc43cda0d22735bc2fff93430d30dc6524d89c9115d0f5b29d3fb0e29
+SIZE (go/dns_blocky-amigan/0xERR0R-blocky-development_GH0/0xERR0R-blocky-development_GH0.tar.gz) = 693557
diff --git a/dns/blocky-amigan/files/blocky-config.yml.sample b/dns/blocky-devel/files/blocky-config.yml.sample
similarity index 100%
rename from dns/blocky-amigan/files/blocky-config.yml.sample
rename to dns/blocky-devel/files/blocky-config.yml.sample
diff --git a/dns/blocky-amigan/files/blocky.in b/dns/blocky-devel/files/blocky.in
similarity index 100%
rename from dns/blocky-amigan/files/blocky.in
rename to dns/blocky-devel/files/blocky.in
diff --git a/dns/blocky-amigan/files/pkg-message.in b/dns/blocky-devel/files/pkg-message.in
similarity index 100%
rename from dns/blocky-amigan/files/pkg-message.in
rename to dns/blocky-devel/files/pkg-message.in
diff --git a/dns/blocky-amigan/pkg-descr b/dns/blocky-devel/pkg-descr
similarity index 67%
rename from dns/blocky-amigan/pkg-descr
rename to dns/blocky-devel/pkg-descr
index 372109f..fae38db 100644
--- a/dns/blocky-amigan/pkg-descr
+++ b/dns/blocky-devel/pkg-descr
@@ -1,4 +1,2 @@
 Fast and lightweight DNS proxy as ad-blocker for local
 network with many features.
-
-WWW: https://0xerr0r.github.io/blocky/
diff --git a/dns/blocky-amigan/pkg-plist b/dns/blocky-devel/pkg-plist
similarity index 100%
rename from dns/blocky-amigan/pkg-plist
rename to dns/blocky-devel/pkg-plist