diff --git a/package/riemann-c-client/riemann-c-client.hash b/package/riemann-c-client/riemann-c-client.hash
index 43d4cd45c4..9daefc9c19 100644
--- a/package/riemann-c-client/riemann-c-client.hash
+++ b/package/riemann-c-client/riemann-c-client.hash
@@ -1,3 +1,4 @@
 # Locally calculated
-sha256  568416d854d1c1e5eac743c9f56db6fa0d6a8144daa74a799d0556bb6b50e679  riemann-c-client-1.10.5.tar.gz
-sha256  da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768  LICENSE
+sha256  468c2d6cb4095e581927005a1dab13656f5a9355e4c68a3a25fceb5c6798a72f  riemann-c-client-2.2.2.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSES/Apache-2.0.txt
+sha256  6fc9e709ccbfe0d77fbffa2427a983282be2eb88e47b1cdb49f21a83b4d1e665  LICENSES/EUPL-1.2.txt
diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk
index f942d560c8..952962fbe6 100644
--- a/package/riemann-c-client/riemann-c-client.mk
+++ b/package/riemann-c-client/riemann-c-client.mk
@@ -4,18 +4,33 @@
 #
 ################################################################################
 
-RIEMANN_C_CLIENT_VERSION = 1.10.5
-RIEMANN_C_CLIENT_SITE = \
-	$(call github,algernon,riemann-c-client,riemann-c-client-$(RIEMANN_C_CLIENT_VERSION))
-RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+
-RIEMANN_C_CLIENT_LICENSE_FILES = LICENSE
+RIEMANN_C_CLIENT_VERSION = 2.2.2
+RIEMANN_C_CLIENT_SITE = https://git.madhouse-project.org/algernon/riemann-c-client/archive
+RIEMANN_C_CLIENT_LICENSE = \
+	Apache-2.0 (lib/riemann/proto/), \
+	EUPL-1.2
+RIEMANN_C_CLIENT_LICENSE_FILES = \
+	LICENSES/Apache-2.0.txt \
+	LICENSES/EUPL-1.2.txt
 RIEMANN_C_CLIENT_INSTALL_STAGING = YES
 RIEMANN_C_CLIENT_MAKE = $(MAKE1)
 # From git
 RIEMANN_C_CLIENT_AUTORECONF = YES
 RIEMANN_C_CLIENT_DEPENDENCIES = \
 	host-pkgconf protobuf-c \
-	$(if $(BR2_PACKAGE_GNUTLS),gnutls) \
 	$(if $(BR2_PACKAGE_JSON_C),json-c)
 
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+RIEMANN_C_CLIENT_CONF_OPTS += --with-tls=gnutls
+RIEMANN_C_CLIENT_DEPENDENCIES += gnutls
+else ifeq ($(BR2_PACKAGE_OPENSSL),y)
+RIEMANN_C_CLIENT_CONF_OPTS += --with-tls=openssl
+RIEMANN_C_CLIENT_DEPENDENCIES += openssl
+else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
+RIEMANN_C_CLIENT_CONF_OPTS += --with-tls=wolfssl
+RIEMANN_C_CLIENT_DEPENDENCIES += wolfssl
+else
+RIEMANN_C_CLIENT_CONF_OPTS += --without-tls
+endif
+
 $(eval $(autotools-package))