diff --git a/devel/bhyve-vm-goagent/Makefile b/devel/bhyve-vm-goagent/Makefile
index 94c794c82d56..884eb387b08e 100644
--- a/devel/bhyve-vm-goagent/Makefile
+++ b/devel/bhyve-vm-goagent/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	bhyve-vm-goagent
 PORTVERSION=	1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel sysutils
 
 MAINTAINER=	araujo@FreeBSD.org
@@ -21,7 +21,7 @@ USES=		go
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	araujobsd
+GH_ACCOUNT=	freenas
 GH_TAGNAME=	a640870c90752e01af30e394ce7c8157f4371a1b
 GH_TUPLE=	gorilla:websocket:v1.2.0:websocket/src/github.com/gorilla/websocket \
 		shirou:gopsutil:v2.17.12:gopsutil/src/github.com/shirou/gopsutil
diff --git a/devel/bhyve-vm-goagent/distinfo b/devel/bhyve-vm-goagent/distinfo
index d05d01bbbc8c..fd2029ed73e9 100644
--- a/devel/bhyve-vm-goagent/distinfo
+++ b/devel/bhyve-vm-goagent/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1517232923
-SHA256 (araujobsd-bhyve-vm-goagent-v1.0-a640870c90752e01af30e394ce7c8157f4371a1b_GH0.tar.gz) = 71ff3e116f6a4298ec683154b6deadad22d0bc7e1e9541c2f765991714d7ba15
-SIZE (araujobsd-bhyve-vm-goagent-v1.0-a640870c90752e01af30e394ce7c8157f4371a1b_GH0.tar.gz) = 7262
+TIMESTAMP = 1520447374
+SHA256 (freenas-bhyve-vm-goagent-v1.0-a640870c90752e01af30e394ce7c8157f4371a1b_GH0.tar.gz) = 71ff3e116f6a4298ec683154b6deadad22d0bc7e1e9541c2f765991714d7ba15
+SIZE (freenas-bhyve-vm-goagent-v1.0-a640870c90752e01af30e394ce7c8157f4371a1b_GH0.tar.gz) = 7262
 SHA256 (gorilla-websocket-v1.2.0_GH0.tar.gz) = 04d1c4fa839a01d32d3c8c558370a964d83b5c980f74c4b965f3dd04f8cb9276
 SIZE (gorilla-websocket-v1.2.0_GH0.tar.gz) = 42984
 SHA256 (shirou-gopsutil-v2.17.12_GH0.tar.gz) = 0abdee29c3c70d9860d8177e70b9bbb0651af4e48b03cfbb36bdf53300fa7268
diff --git a/devel/bhyve-vm-goagent/pkg-descr b/devel/bhyve-vm-goagent/pkg-descr
index 69584d8b07b2..e039ab969f30 100644
--- a/devel/bhyve-vm-goagent/pkg-descr
+++ b/devel/bhyve-vm-goagent/pkg-descr
@@ -4,4 +4,4 @@ memory usage, cpu, disk and ethernet configuration.
 
 It supports virtio-console as well as WebSocket protocol.
 
-WWW: https://github.com/araujobsd/bhyve-vm-goagent
+WWW: https://github.com/freenas/bhyve-vm-goagent
diff --git a/devel/libhyve-remote/Makefile b/devel/libhyve-remote/Makefile
index fe5fed27a9f7..86e9743d2706 100644
--- a/devel/libhyve-remote/Makefile
+++ b/devel/libhyve-remote/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libhyve-remote
 PORTVERSION=	0.1.4.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	araujo@FreeBSD.org
@@ -33,7 +34,7 @@ LIB_FILES=	lib/libhyverem.so.1	\
 PLIST_DIRS=	${LOCALBASE}/include/libhyverem
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	araujobsd
+GH_ACCOUNT=	freenas
 
 USE_LDCONFIG=	yes
 
diff --git a/devel/libhyve-remote/distinfo b/devel/libhyve-remote/distinfo
index 0c34155e81fa..9614e965a082 100644
--- a/devel/libhyve-remote/distinfo
+++ b/devel/libhyve-remote/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512616485
-SHA256 (araujobsd-libhyve-remote-0.1.4.1_GH0.tar.gz) = cf086f6a2c6f43730e74f98eac8cb8b009a6f0332c5344bfa8a0a12e4518d14b
-SIZE (araujobsd-libhyve-remote-0.1.4.1_GH0.tar.gz) = 11581
+TIMESTAMP = 1520447091
+SHA256 (freenas-libhyve-remote-0.1.4.1_GH0.tar.gz) = cf086f6a2c6f43730e74f98eac8cb8b009a6f0332c5344bfa8a0a12e4518d14b
+SIZE (freenas-libhyve-remote-0.1.4.1_GH0.tar.gz) = 11581
diff --git a/devel/libhyve-remote/pkg-descr b/devel/libhyve-remote/pkg-descr
index facac148a52d..ae772e462600 100644
--- a/devel/libhyve-remote/pkg-descr
+++ b/devel/libhyve-remote/pkg-descr
@@ -6,4 +6,4 @@ With a basic data structure it is easy to implement any remote desktop
 protocol without dig into the protocol specification or third part
 libraries, you can check some of our examples.
 
-WWW: https://github.com/araujobsd/libhyve-remote
+WWW: https://github.com/freenas/libhyve-remote