diff --git a/common/shlibs b/common/shlibs
index aa695ce3e54..87ed20a3932 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1075,12 +1075,12 @@ libijs-0.35.so libijs-0.8_1
 libgs.so.9 libgs-0.8_1
 libssh2.so.1 libssh2-1.4.1_1
 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
-libsnmp.so.30 libnet-snmp-5.7.1_1
-libnetsnmp.so.30 libnet-snmp-5.7.1_1
-libnetsnmpagent.so.30 libnet-snmp-5.7.1_1
-libnetsnmpmibs.so.30 libnet-snmp-5.7.1_1
-libnetsnmptrapd.so.30 libnet-snmp-5.7.1_1
-libnetsnmphelpers.so.30 libnet-snmp-5.7.3_1
+libsnmp.so.35 libnet-snmp-5.8_1
+libnetsnmp.so.35 libnet-snmp-5.8_1
+libnetsnmpagent.so.35 libnet-snmp-5.8_1
+libnetsnmpmibs.so.35 libnet-snmp-5.8_1
+libnetsnmptrapd.so.35 libnet-snmp-5.8_1
+libnetsnmphelpers.so.35 libnet-snmp-5.8_1
 libieee1284.so.3 libieee1284-0.2.10_1
 libsane.so.1 libsane-1.0.22_1
 libfltk.so.1.3 fltk-1.3.0_1
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index d5533cc01a7..9cddc635244 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,16 +1,15 @@
 # Template build file for 'net-snmp'.
 pkgname=net-snmp
-version=5.7.3
-revision=14
+version=5.8
+revision=1
 hostmakedepends="pkg-config unzip"
 makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel"
 short_desc="Simple Network Management Protocol (SNMP) suite"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.net-snmp.org/"
 license="BSD"
-# tar.gz is broken, use zip instead
-distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.zip"
-checksum=e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e
+distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
+checksum=b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf
 
 LDFLAGS="-lpthread"
 
@@ -43,7 +42,7 @@ libnet-snmp_package() {
 	}
 }
 net-snmp-devel_package() {
-	depends="libnet-snmp>=${version}_${revision}"
+	depends="libnet-snmp>=${version}_${revision} libressl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/net-snmp-config