diff --git a/net-mgmt/riemann-c-client/Makefile b/net-mgmt/riemann-c-client/Makefile
index 058cb14ca4ab..878b031777ac 100644
--- a/net-mgmt/riemann-c-client/Makefile
+++ b/net-mgmt/riemann-c-client/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	riemann-c-client
-PORTVERSION=	2.0.0
-DISTVERSIONPREFIX=	${PORTNAME}-
+PORTVERSION=	2.1.0
 CATEGORIES=	net-mgmt
+MASTER_SITES=	https://git.madhouse-project.org/algernon/${PORTNAME}/archive/
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	C library and command-line tool for Riemann
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 BUILD_DEPENDS=	check>0:devel/check
-LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c \
-		libgnutls.so:security/gnutls \
-		libjson-c.so:devel/json-c
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libjson-c.so:devel/json-c \
+		libprotobuf-c.so:devel/protobuf-c
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	algernon
-
 post-patch:
 	@${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/Makefile.am
 
 # Running |make test| isn't on poudriere menu yet, so force-feed
-pre-install:	do-test
+pre-install: do-test
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/riemann-c-client/distinfo b/net-mgmt/riemann-c-client/distinfo
index cc2c3544f308..ec8c2e854340 100644
--- a/net-mgmt/riemann-c-client/distinfo
+++ b/net-mgmt/riemann-c-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652649613
-SHA256 (algernon-riemann-c-client-riemann-c-client-2.0.0_GH0.tar.gz) = 36f3fd6e293d61791d288682340fe69a87af9a843410d9b4b8b4192226cdea5f
-SIZE (algernon-riemann-c-client-riemann-c-client-2.0.0_GH0.tar.gz) = 66462
+TIMESTAMP = 1659211256
+SHA256 (riemann-c-client-2.1.0.tar.gz) = e1a4439ee23f4557d7563a88c67044d50c384641cf160d95114480404c547085
+SIZE (riemann-c-client-2.1.0.tar.gz) = 72497
diff --git a/net-mgmt/riemann-c-client/pkg-descr b/net-mgmt/riemann-c-client/pkg-descr
index 449b8b87a414..541d4980a8e7 100644
--- a/net-mgmt/riemann-c-client/pkg-descr
+++ b/net-mgmt/riemann-c-client/pkg-descr
@@ -1,5 +1,5 @@
 Riemann-C-client is a C client library for the Riemann monitoring system,
 providing a convenient and simple API, high test coverage and a copyleft
 license, along with API and ABI stability.
 
-WWW: https://github.com/algernon/riemann-c-client/#readme
+WWW: https://git.madhouse-project.org/algernon/riemann-c-client
diff --git a/net-mgmt/riemann-c-client/pkg-plist b/net-mgmt/riemann-c-client/pkg-plist
index fe44fe840076..3c3c1788da8c 100644
--- a/net-mgmt/riemann-c-client/pkg-plist
+++ b/net-mgmt/riemann-c-client/pkg-plist
@@ -1,15 +1,16 @@
 bin/riemann-client
 include/riemann/attribute.h
 include/riemann/client.h
+include/riemann/communicate.h
 include/riemann/event.h
 include/riemann/message.h
 include/riemann/proto/riemann.pb-c.h
 include/riemann/query.h
 include/riemann/riemann-client.h
 include/riemann/simple.h
 lib/libriemann-client-gnutls.a
 lib/libriemann-client-gnutls.so
 lib/libriemann-client-gnutls.so.11
-lib/libriemann-client-gnutls.so.11.0.0
+lib/libriemann-client-gnutls.so.11.1.0
 libdata/pkgconfig/riemann-client.pc
 man/man1/riemann-client.1.gz